Module Name: src Committed By: christos Date: Thu Mar 8 20:41:04 UTC 2012
Modified Files: src/external/gpl2/xcvs/dist/src: subr.c Log Message: - Put back %, which was removed from the new format strings [with reversed meaning, so that we are still compatible with the new format] - Fix format strings To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/src/subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl2/xcvs/dist/src/subr.c diff -u src/external/gpl2/xcvs/dist/src/subr.c:1.1.1.1 src/external/gpl2/xcvs/dist/src/subr.c:1.2 --- src/external/gpl2/xcvs/dist/src/subr.c:1.1.1.1 Tue Apr 7 18:10:28 2009 +++ src/external/gpl2/xcvs/dist/src/subr.c Thu Mar 8 15:41:04 2012 @@ -1285,7 +1285,7 @@ format_cmdline (const char *format, ...) dellist(&pflist); free(b); error (1, 0, -"internal error: unknown integer arg size (%d)", +"internal error: unknown integer arg size (%zu)", length); break; } @@ -1328,7 +1328,7 @@ format_cmdline (const char *format, ...) dellist(&pflist); free(b); error (1, 0, -"internal error: unknown floating point arg size (%d)", +"internal error: unknown floating point arg size (%zu)", length); break; } @@ -1458,6 +1458,7 @@ format_cmdline (const char *format, ...) * output string into separate arguments * * %X means sub var "X" into location + * NB: The meaning of the following 2 formats is reversed in the new mode * %{VWXYZ} means sub V,W,X,Y,Z into location as a single arg. The shell * || would be to quote the comma separated arguments. Each list * that V, W, X, Y, and Z represent attributes of will cause a new @@ -1567,6 +1568,12 @@ format_cmdline (const char *format, ...) } } #endif /* SUPPORT_OLD_INFO_FMT_STRINGS */ + if (*s == ',') { +#ifdef SUPPORT_OLD_INFO_FMT_STRINGS + if (!oldway) +#endif /* SUPPORT_OLD_INFO_FMT_STRINGS */ + s++, onearg = 1; + } /* parse the format string and sub in... */ if (*s == '{')