 @@ -1,14 +1,14 @@
-/*	$NetBSD: makeshell.c,v 1.1.1.1 2009/12/13 16:55:08 kardel Exp $	*/
+/*	$NetBSD: makeshell.c,v 1.2 2009/12/13 23:25:40 christos Exp $	*/
 /*
  *  Id: 7226344c6486a4eda395f893881080b7d80a2003
  * Time-stamp:      "2009-11-01 11:52:37 bkorb"
+ *
  *  This module will interpret the options set in the tOptions
  *  structure and create a Bourne shell script capable of parsing them.
+ *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
  *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved
+ *
 @@ -607,27 +607,27 @@ emitUsage( tOptions* pOpts )
         if ((pzLeader == NULL) && (pzShell != NULL))
             printf( "#! %s\n", pzShell );
         printf( zPreamble, zStartMarker, pzOutName, zTimeBuf );
+    }
     /*
      *  Get a copy of the original program name in lower case
      */
+    {
         char* pzPN = zTimeBuf;
         tCC*  pz   = pOpts->pzPROGNAME;
         for (;;) {
-            if ((*pzPN++ = tolower( *pz++ )) == '\0')
+            if ((*pzPN++ = tolower( (unsigned char)*pz++ )) == '\0')
                 break;
+        }
+    }
     printf( zEndPreamble, pOpts->pzPROGNAME );
     pOpts->pzProgPath = pOpts->pzProgName = zTimeBuf;
     textToVariable( pOpts, TT_LONGUSAGE, NULL );
     textToVariable( pOpts, TT_USAGE,     NULL );
+    {
         tOptDesc* pOptDesc = pOpts->pOptDesc;
         int       optionCt = pOpts->optCt;
 @@ -823,40 +823,40 @@ emitMatchExpr( tCC* pzMatchName, tOptDes
          */
         if ((pOD == pCurOpt) || SKIP_OPT(pOD)){
             if (--oCt <= 0)
                 break;
             pOD++;
             continue;
+        }
         /*
          *  Check each character of the name case insensitively.
          *  They must not be the same.  They cannot be, because it would
          *  not compile correctly if they were.
          */
-        while (  toupper( pOD->pz_Name[matchCt] )
+        while (  toupper( (unsigned char)pOD->pz_Name[matchCt] )
-              == toupper( pzMatchName[matchCt] ))
+                 == toupper( (unsigned char)pzMatchName[matchCt] ))
             matchCt++;
         if (matchCt > min)
             min = matchCt;
         /*
          *  Check the disablement name, too.
          */
         if (pOD->pz_DisableName != NULL) {
             matchCt = 0;
-            while (  toupper( pOD->pz_DisableName[matchCt] )
+            while (  toupper( (unsigned char)pOD->pz_DisableName[matchCt] )
-                  == toupper( pzMatchName[matchCt] ))
+                     == toupper( (unsigned char)pzMatchName[matchCt] ))
                 matchCt++;
             if (matchCt > min)
                 min = matchCt;
+        }
         if (--oCt <= 0)
             break;
         pOD++;
+    }
     /*
      *  IF the 'min' is all or one short of the name length,
      *  THEN the entire string must be matched.
      */
 @@ -1050,27 +1050,27 @@ genshelloptUsage( tOptions*  pOpts, int
         wait( &sts );
+    }
+    }
     /*
      *  Generate the pzProgName, since optionProcess() normally
      *  gets it from the command line
      */
+    {
         char* pz;
         AGDUPSTR( pz, pShellParseOptions->pzPROGNAME, "program name" );
         pShellParseOptions->pzProgName = pz;
         while (*pz != NUL) {
-            *pz = tolower( *pz );
+            *pz = tolower( (unsigned char)*pz );
             pz++;
+        }
+    }
     /*
      *  Separate the makeshell usage from the client usage
      */
     fprintf( option_usage_fp, zGenshell, pShellParseOptions->pzProgName );
     fflush( option_usage_fp );
     /*
      *  Now, print the client usage.
      */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.c,v 1.1.1.1 2009/12/13 16:55:15 kardel Exp $	*/
+/*	$NetBSD: version.c,v 1.2 2009/12/13 23:25:40 christos Exp $	*/
 /*  Id: e21e2bf9958c54e440efbdc7c1026e46ac589f66
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
+ *
  *  This module implements the default usage procedure for
  *  Automated Options.  It may be overridden, of course.
  */
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
  *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved
 @@ -57,27 +57,27 @@ optionVersion( void )
 static void
 printVersion( tOptions* pOpts, tOptDesc* pOD, FILE* fp )
+{
     char swCh;
     /*
      *  IF the optional argument flag is off, or the argument is not provided,
      *  then just print the version.
      */
     if (  ((pOD->fOptState & OPTST_ARG_OPTIONAL) == 0)
        || (pOD->optArg.argString == NULL))
          swCh = 'v';
-    else swCh = tolower(pOD->optArg.argString[0]);
+    else swCh = tolower((unsigned char)pOD->optArg.argString[0]);
     if (pOpts->pzFullVersion != NULL) {
         fputs( pOpts->pzFullVersion, fp );
         fputc( '\n', fp );
     } else {
         char const *pz = pOpts->pzUsageTitle;
         do { fputc(*pz, fp); } while (*(pz++) != '\n');
+    }
     switch (swCh) {
     case NUL: /* arg provided, but empty */
     case 'v':