Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly ignore source args on a --read-batch command.
[rsync/rsync.git]
/
popt
/
popthelp.c
diff --git
a/popt/popthelp.c
b/popt/popthelp.c
index
ba8d024
..
6a00976
100644
(file)
--- a/
popt/popthelp.c
+++ b/
popt/popthelp.c
@@
-121,7
+121,7
@@
getArgDescrip(const struct poptOption * opt,
if (opt->argDescrip) return D_(translation_domain, opt->argDescrip);
switch (opt->argInfo & POPT_ARG_MASK) {
if (opt->argDescrip) return D_(translation_domain, opt->argDescrip);
switch (opt->argInfo & POPT_ARG_MASK) {
- case POPT_ARG_NONE: return POPT_("NONE");
+ /*case POPT_ARG_NONE: return POPT_("NONE");*/ /* impossible */
#ifdef DYING
case POPT_ARG_VAL: return POPT_("VAL");
#else
#ifdef DYING
case POPT_ARG_VAL: return POPT_("VAL");
#else
@@
-767,6
+767,9
@@
static int showShortOptions(const struct poptOption * opt, FILE * fp,
char * s = (str != NULL ? str : memset(alloca(300), 0, 300));
int len = 0;
char * s = (str != NULL ? str : memset(alloca(300), 0, 300));
int len = 0;
+ if (s == NULL)
+ return 0;
+
/*@-boundswrite@*/
if (opt != NULL)
for (; (opt->longName || opt->shortName || opt->arg); opt++) {
/*@-boundswrite@*/
if (opt != NULL)
for (; (opt->longName || opt->shortName || opt->arg); opt++) {