nginx: src/core/ngx_string.c comparison

%*s format

comparison

equal deleted inserted replaced

-:25c93614e6b9
+:d85879105d35
 *    %r                        rlim_t
 *    %p                        void *
 *    %V                        ngx_str_t *
 *    %v                        ngx_variable_value_t *
 *    %s                        null-terminated string
+*    %*s                       length and string
 *    %Z                        '\0'
 *    %N                        '\n'
 *    %c                        char
 *    %%                        %
 *
 /*
 * really we need temp[NGX_INT64_LEN] only,
 * but icc issues the warning
 */
 int                    d;
-size_t                 len;
+size_t                 len, slen;
 uint32_t               ui32;
 int64_t                i64;
 uint64_t               ui64;
 ngx_msec_t             ms;
 ngx_uint_t             width, sign, hexadecimal, max_width;
 zero = (u_char) ((*++fmt == '0') ? '0' : ' ');
 width = 0;
 sign = 1;
 hexadecimal = 0;
 max_width = 0;
+slen = 0;
 p = temp + NGX_INT64_LEN;
 while (*fmt >= '0' && *fmt <= '9') {
 width = width * 10 + *fmt++ - '0';
 hexadecimal = 1;
 sign = 0;
 fmt++;
 continue;
+case '*':
+slen = va_arg(args, u_int);
+fmt++;
+continue;
 default:
 break;
 }
 break;
 continue;
 case 's':
 p = va_arg(args, u_char *);
-while (*p && buf < last) {
+if (slen == 0) {
-*buf++ = *p++;
+while (*p && buf < last) {
-}
+*buf++ = *p++;
+}
+} else {
+buf = ngx_cpymem(buf, p, slen);
+}
 fmt++;
 continue;
 case 'O':

Mercurial > hg > nginx