- Improved option_error() to make sure that the user sees the error in

[rsync/rsync.git] / popt / popthelp.c

diff --git a/popt/popthelp.c b/popt/popthelp.c
index 17adc6f..1ddb895 100644 (file)
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -134,19 +134,23 @@ singleOptionDefaultValue(int lineLength,
     case POPT_ARG_VAL:
     case POPT_ARG_INT:
     {  long aLong = *((int *)opt->arg);
-       le += sprintf(le, "%ld", aLong);
+       sprintf(le, "%ld", aLong);
+       le += strlen(le);
     }  break;
     case POPT_ARG_LONG:
     {  long aLong = *((long *)opt->arg);
-       le += sprintf(le, "%ld", aLong);
+       sprintf(le, "%ld", aLong);
+       le += strlen(le);
     }  break;
     case POPT_ARG_FLOAT:
     {  double aDouble = *((float *)opt->arg);
-       le += sprintf(le, "%g", aDouble);
+       sprintf(le, "%g", aDouble);
+       le += strlen(le);
     }  break;
     case POPT_ARG_DOUBLE:
     {  double aDouble = *((double *)opt->arg);
-       le += sprintf(le, "%g", aDouble);
+       sprintf(le, "%g", aDouble);
+       le += strlen(le);
     }  break;
     case POPT_ARG_STRING:
     {  const char * s = *(const char **)opt->arg;
@@ -187,11 +191,11 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 {
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
-    const char * help = D_(translation_domain, opt->descrip);
+    const unsigned char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
-    char * defs = NULL;
-    char * left;
+    unsigned char * defs = NULL;
+    unsigned char * left;
     int nb = maxLeftCol + 1;
 
     /* Make sure there's more than enough room in target buffer. */
@@ -271,7 +275,8 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
                *le++ = '=';
                if (negate) *le++ = '~';
                /*@-formatconst@*/
-               le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
+               sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
+               le += strlen(le);
                /*@=formatconst@*/
                *le++ = ']';
            }   break;
@@ -309,7 +314,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 
     helpLength = strlen(help);
     while (helpLength > lineLength) {
-       const char * ch;
+       const unsigned char * ch;
        char format[10];
 
        ch = help + lineLength - 1;