--- OLD/popt/popthelp.c	Thu Jan  1 00:00:00 1970
+++ NEW/popt/popthelp.c	Thu Jan  1 00:00:00 1970
@@ -12,6 +12,8 @@
 #include "system.h"
 #include "poptint.h"
 
+#define ucisspace(x) isspace((unsigned char)(x))
+
 /**
  * @param con		context
  * @param key		option(s)
@@ -23,6 +25,7 @@
 	/*@globals fileSystem@*/
 	/*@modifies fileSystem@*/
 {
+foo=foo; arg=arg; data=data;
     if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
@@ -63,7 +66,7 @@
 /**
  * @param table		option(s)
  */
-/*@observer@*/ /*@null@*/ static const char *const
+/*@observer@*/ /*@null@*/ static const char *
 getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
 	/*@*/
 {
@@ -81,7 +84,7 @@
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-/*@observer@*/ /*@null@*/ static const char *const
+/*@observer@*/ /*@null@*/ static const char *
 getArgDescrip(const struct poptOption * opt,
 		/*@-paramuse@*/		/* FIX: wazzup? */
 		/*@null@*/ const char * translation_domain)
@@ -89,7 +92,7 @@
 	/*@*/
 {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
-
+translation_domain=translation_domain;
     if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2))
 	if (opt->argDescrip) return POPT_(opt->argDescrip);
 
@@ -123,6 +126,7 @@
     char * le = malloc(4*lineLength + 1);
     char * l = le;
 
+translation_domain=translation_domain;
     if (le == NULL) return NULL;	/* XXX can't happen */
     *le = '\0';
     *le++ = '(';
@@ -318,9 +322,9 @@
 	char format[10];
 
 	ch = help + lineLength - 1;
-	while (ch > help && !isspace(*ch)) ch--;
+	while (ch > help && !ucisspace(*ch)) ch--;
 	if (ch == help) break;		/* give up */
-	while (ch > (help + 1) && isspace(*ch)) ch--;
+	while (ch > (help + 1) && ucisspace(*ch)) ch--;
 	ch++;
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
@@ -328,7 +332,7 @@
 	fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
-	while (isspace(*help) && *help) help++;
+	while (ucisspace(*help) && *help) help++;
 	helpLength = strlen(help);
     }
 
@@ -479,6 +483,7 @@
 {
     int leftColWidth;
 
+flags=flags;
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
 	fprintf(fp, " %s\n", con->otherHelp);
@@ -638,6 +643,7 @@
 {
     int cursor;
 
+flags=flags;
     cursor = showHelpIntro(con, fp);
     cursor += showShortOptions(con->options, fp, NULL);
     (void) singleTableUsage(con, fp, cursor, con->options, NULL);