shall include the source code for the parts of OpenSSL used as well
as that of the covered work. */
+#define USE_GNULIB_ALLOC
+
#include "wget.h"
#include <stdio.h>
}
else
fprintf (stderr,
- _("Invalid dot style specification `%s'; leaving unchanged.\n"),
- params);
+ _("Invalid dot style specification %s; leaving unchanged.\n"),
+ quote (params));
}
\f
/* "Thermometer" (bar) progress. */
#endif
}
-#if HAVE_MBTOWC && HAVE_WCWIDTH
+#if USE_NLS_PROGRESS_BAR
int
count_cols (const char *mbs)
{
}
#else
# define count_cols(mbs) ((int)(strlen(mbs)))
-# undef wcwidth
-# define wcwidth(wc) (1)
#endif
/* Translation note: "ETA" is English-centric, but this must
int nbytes;
int ncols;
-#if HAVE_WCWIDTH && HAVE_MBTOWC
+#if USE_NLS_PROGRESS_BAR
eta_trans = _(eta_str);
#else
eta_trans = eta_str;
"[]" - progress bar decorations - 2 chars
" nnn,nnn,nnn" - downloaded bytes - 12 chars or very rarely more
" 12.5K/s" - download rate - 8 chars
- " eta 36m 51s" - ETA - 13 chars
+ " eta 36m 51s" - ETA - 14 chars
"=====>..." - progress bar - the rest
*/
int dlbytes_size = 1 + MAX (size_grouped_len, 11);
- int progress_size = bp->width - (4 + 2 + dlbytes_size + 8 + 13);
+ int progress_size = bp->width - (4 + 2 + dlbytes_size + 8 + 14);
if (progress_size < 5)
progress_size = 0;
move_to_end (p);
}
- assert (p - bp->buffer - bytes_cols_diff - size_grouped_diff <= bp->width);
-
while (p - bp->buffer - bytes_cols_diff - size_grouped_diff < bp->width)
*p++ = ' ';
*p = '\0';