Various code cleanups

diff --git a/ChangeLog b/ChangeLog
index edf0ac8854bf75fabfd6ec22f6c7fdda4b6a5cb3..98c7be2b88a0b5a6cb4c2a10679fd8596ebbbeb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-15  Charles Wilson  <cwilson@...>
+
+       Various code cleanups
+       * Makefile.am: Hack to work around conflict between
+       /usr/lib/libuuid* and /usr/lib/w32api/libuuid.
+       * src/ascii/ascii.c (main): Make optCon a global static.
+       When information is explicitly requested by the user, it
+       is not an error: invoke usage, help, version, license with
+       stdout not stderr.
+       (usage, help, version, license): Remove optCon function
+       argument throughout.
+       * src/banner/banner.c: Ditto.
+       * src/clip/getclip.c: Ditto.
+       * src/clip/putclip.c: Ditto.
+       * src/conv/conv.c: Ditto.
+       * src/cygstart/cygstart.c: Ditto.
+       * src/dump/dump.c: Ditto.
+       * src/mkshortcut/mkshortcut.c: Ditto.
+       * src/readshortcut/readshortcut.c: Ditto.
+       * src/realpath/realpath.c: Ditto.
+
 2010-08-15  Charles Wilson  <cwilson@...>
 
        * INSTALL: Remove from source control.

diff --git a/Makefile.am b/Makefile.am
index 266346e78833d1c2852e485c700e745e579af451..c519bc2c92c32fbab47d21f36c9b58c59a0da237 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,8 +111,8 @@ src_conv_conv_LDADD                 = -lpopt
 src_cygstart_cygstart_LDADD         = -lpopt
 src_dump_dump_LDADD                 = -lpopt
 src_lpr_lpr_LDADD                   = -lwinspool
-src_mkshortcut_mkshortcut_LDADD     = -lpopt -lole32 -luuid
-src_readshortcut_readshortcut_LDADD = -lpopt -lole32 -luuid
+src_mkshortcut_mkshortcut_LDADD     = -lpopt -lole32 /usr/lib/w32api/libuuid.a
+src_readshortcut_readshortcut_LDADD = -lpopt -lole32 /usr/lib/w32api/libuuid.a
 src_realpath_realpath_LDADD         = -lpopt
 
 src_lpr_lpr_SOURCES = \

diff --git a/src/ascii/ascii.c b/src/ascii/ascii.c
index 0fe9f1520001ae0be1420c5ca5c4a22ff56e9c71..8771a7b453887a3a2aeaf5d02c717ff815d94b9e 100755 (executable)
--- a/src/ascii/ascii.c
+++ b/src/ascii/ascii.c
@@ -34,18 +34,18 @@ static const char copyrightID[] =
 
 static void printTopDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 static void ascii (FILE * f);
 
 static char *program_name;
+static poptContext optCon;
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = 0;
@@ -80,16 +80,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         }
     }
@@ -164,26 +164,26 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/banner/banner.c b/src/banner/banner.c
index 0cf531b9771eef8c08beb8e5441df6dfcc082028..bcfdbad5d446bafe112959472d336adea89822ac 100644 (file)
--- a/src/banner/banner.c
+++ b/src/banner/banner.c
@@ -31,12 +31,13 @@ static const char copyrightID[] =
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 
 static char *program_name;
+static poptContext optCon;
 
 static char *c = "X";
 static int w = 80;
@@ -134,7 +135,6 @@ print_line (const char *line)
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = 0;
@@ -181,16 +181,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         case 'c':              /* no additional action needed */
           break;
@@ -211,7 +211,7 @@ main (int argc, const char **argv)
   if (rest == NULL)
     {
       fprintf (stderr, "%s: not enough arguments\n", program_name);
-      usage (optCon, stderr, program_name);
+      usage (stderr, program_name);
     }
   else
     {
@@ -281,13 +281,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -295,13 +295,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/clip/getclip.c b/src/clip/getclip.c
index 52874770eb6b33bb4e5ed9b491b04d47d7267a00..b899ad7233553d2ba274f793b77816b0da614a97 100644 (file)
--- a/src/clip/getclip.c
+++ b/src/clip/getclip.c
@@ -51,18 +51,18 @@ typedef struct
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 static int getclip (FILE * out, flags_struct flags, FILE * f, char *name);
 
 static char *program_name;
+static poptContext optCon;
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = 0;
@@ -110,16 +110,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         case 'd':
           flags.dosflag = TRUE;
@@ -243,13 +243,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -257,13 +257,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/clip/putclip.c b/src/clip/putclip.c
index cf75d4c38d606666ffb013f862bc61a2a95b59b5..31fc4cc43f93049666878467f4269fe1a1bf3fe2 100644 (file)
--- a/src/clip/putclip.c
+++ b/src/clip/putclip.c
@@ -55,18 +55,18 @@ typedef struct
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 static int putclip (FILE * in, flags_struct flags, FILE * f, char *name);
 
 static char *program_name;
+static poptContext optCon;
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = PUTCLIP_OK;
@@ -114,16 +114,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         case 'd':
           flags.dosflag = TRUE;
@@ -240,13 +240,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -254,13 +254,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/conv/conv.c b/src/conv/conv.c
index 5e9e22dfd4e0f5f1a8ee5d44ec569816cc2815e7..bb878d6354f3feaaef2fdc097099cc4ffcddb759 100755 (executable)
--- a/src/conv/conv.c
+++ b/src/conv/conv.c
@@ -68,17 +68,18 @@ typedef struct Opt_ {
 static void printTopDescription(FILE * f, char * name);
 static void printBottomDescription(FILE * f, char * name);
 static const char * getVersion(void);
-static void usage(poptContext optCon, FILE * f, char * name);
-static void help(poptContext optCon, FILE * f, char * name);
-static void version(poptContext optCon, FILE * f, char * name);
-static void license(poptContext optCon, FILE * f, char * name);
+static void usage(FILE * f, char * name);
+static void help(FILE * f, char * name);
+static void version(FILE * f, char * name);
+static void license(FILE * f, char * name);
 static int basename(char* p, const char* s);
 static int convert(const char *fn, Opt opt);
 static int exitOnZero(const char *fn, Opt opts, 
                       FILE* in, FILE* out, char* tempFn);
 
+static poptContext optCon;
+
 int main(int argc, const char ** argv) {
-  poptContext optCon;
   const char ** rest;
   Opt opts = {
     NULL,
@@ -169,13 +170,13 @@ int main(int argc, const char ** argv) {
 
   while ((rc = poptGetNextOpt(optCon)) > 0) {
     switch (rc) {
-      case '?':  help(optCon, stderr, opts.progname);
+      case '?':  help(stdout, opts.progname);
                  goto exit;
-      case 'u':  usage(optCon, stderr, opts.progname);
+      case 'u':  usage(stdout, opts.progname);
                  goto exit;
-      case 'v':  version(optCon, stderr, opts.progname);
+      case 'v':  version(stdout, opts.progname);
                  goto exit;
-      case 'l':  license(optCon, stderr, opts.progname);
+      case 'l':  license(stdout, opts.progname);
                  goto exit;
     }
   }
@@ -345,24 +346,24 @@ static printLicense(FILE * f, char * name)
   fprintf(f, "See the COPYING file for license information.\n");
 }
 
-static void usage(poptContext optCon, FILE * f, char * name)
+static void usage(FILE * f, char * name)
 {
   poptPrintUsage(optCon, f, 0);
 }
 
-static void help(poptContext optCon, FILE * f, char * name)
+static void help(FILE * f, char * name)
 {
   printTopDescription(f, name);
   poptPrintHelp(optCon, f, 0);
   printBottomDescription(f, name);
 }
 
-static void version(poptContext optCon, FILE * f, char * name)
+static void version(FILE * f, char * name)
 {
   printTopDescription(f, name);
 }
 
-static void license(poptContext optCon, FILE * f, char * name)
+static void license(FILE * f, char * name)
 {
   printTopDescription(f, name);
   printLicense(f, name);

diff --git a/src/cygstart/cygstart.c b/src/cygstart/cygstart.c
index 6d6273e8b744fe0241d5ee309eb7e9dd46f9bac6..0e9e62d67a9063e876ff175999d1fbe63d42ee9c 100644 (file)
--- a/src/cygstart/cygstart.c
+++ b/src/cygstart/cygstart.c
@@ -56,6 +56,7 @@ static const char copyrightID[] =
 
 /* The name this program was run with. */
 static char *program_name;
+static poptContext optCon;
 
 typedef enum StartFlags
 {
@@ -74,10 +75,10 @@ static char *startError (int err);
 static const char *getVersion (void);
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 
 static size_t
 mbstowcs_noerr (wchar_t * wcs, const char *mbs, size_t n)
@@ -111,7 +112,6 @@ mbstowcs_dup (const char *mbs)
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char *arg;
   const char **rest;
   int rc;
@@ -250,7 +250,7 @@ main (int argc, const char **argv)
         {
           /* Help options */
         case '?':
-          help (optCon, stdout, program_name);
+          help (stdout, program_name);
           poptFreeContext (optCon);
           free (program_name);
           if (action)
@@ -259,7 +259,7 @@ main (int argc, const char **argv)
             free (workDir);
           return (0);
         case 'u':
-          usage (optCon, stdout, program_name);
+          usage (stdout, program_name);
           poptFreeContext (optCon);
           free (program_name);
           if (action)
@@ -268,7 +268,7 @@ main (int argc, const char **argv)
             free (workDir);
           return (0);
         case 'v':
-          version (optCon, stdout, program_name);
+          version (stdout, program_name);
           poptFreeContext (optCon);
           free (program_name);
           if (action)
@@ -277,7 +277,7 @@ main (int argc, const char **argv)
             free (workDir);
           return (0);
         case 'l':
-          license (optCon, stdout, program_name);
+          license (stdout, program_name);
           poptFreeContext (optCon);
           free (program_name);
           if (action)
@@ -427,7 +427,7 @@ main (int argc, const char **argv)
     }
   else
     {
-      usage (optCon, stdout, program_name);
+      usage (stdout, program_name);
       return (2);
     }
 
@@ -817,13 +817,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -831,13 +831,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/dump/dump.c b/src/dump/dump.c
index 593c30dd70ca9f0b01f78e3e89927ab2ca92240f..fe08ba458faf197fcfcb401cfd0a1cd34bd87c48 100644 (file)
--- a/src/dump/dump.c
+++ b/src/dump/dump.c
@@ -40,21 +40,21 @@ static const char copyrightID[] =
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 static void puthex (long n, int digits, int pos);
 static void dumpfile (FILE * f);
 
 static char *program_name;
+static poptContext optCon;
 static char line[80];
 static long address;
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = 0;
@@ -89,16 +89,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         }
     }
@@ -202,13 +202,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -216,13 +216,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/mkshortcut/mkshortcut.c b/src/mkshortcut/mkshortcut.c
index be68ab9bf3c3de768b60303f68e8a095aabedfbd..790e6978242419c59f3b86aeaa895bcdc1aec3ad 100644 (file)
--- a/src/mkshortcut/mkshortcut.c
+++ b/src/mkshortcut/mkshortcut.c
@@ -67,21 +67,21 @@ typedef struct optvals_s
   char *icon_name_arg;
 } optvals;
 
-static int mkshortcut (optvals opts, poptContext optCon);
+static int mkshortcut (optvals opts);
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion ();
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 
 static char *program_name;
+static poptContext optCon;
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = 0;
@@ -181,16 +181,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         case 'd':
           if (arg = poptGetOptArg (optCon))
@@ -292,7 +292,7 @@ main (int argc, const char **argv)
       fprintf (stderr,
                "%s: --iconoffset|-j only valid in conjuction with --icon|-i\n",
                program_name);
-      usage (optCon, stderr, program_name);
+      usage (stderr, program_name);
       ec = 1;
       goto exit;
     }
@@ -302,7 +302,7 @@ main (int argc, const char **argv)
       fprintf (stderr,
                "%s: --smprograms|-P not valid in conjuction with --desktop|-D\n",
                program_name);
-      usage (optCon, stderr, program_name);
+      usage (stderr, program_name);
       ec = 1;
       goto exit;
     }
@@ -333,19 +333,19 @@ main (int argc, const char **argv)
           while (*rest)
             fprintf (stderr, "%s ", *rest++);
           fprintf (stderr, "\n");
-          usage (optCon, stderr, program_name);
+          usage (stderr, program_name);
           ec = 1;
         }
       else
         {
           // THE MEAT GOES HERE
-          ec = mkshortcut (opts, optCon);
+          ec = mkshortcut (opts);
         }
     }
   else
     {
       fprintf (stderr, "%s: TARGET not specified\n", program_name);
-      usage (optCon, stderr, program_name);
+      usage (stderr, program_name);
       ec = 1;
     }
 
@@ -380,7 +380,7 @@ exit:
 }
 
 int
-mkshortcut (optvals opts, poptContext optCon)
+mkshortcut (optvals opts)
 {
   char link_name[MAX_PATH];
   char exe_name[MAX_PATH];
@@ -412,7 +412,7 @@ mkshortcut (optvals opts, poptContext optCon)
           free (buf_str);
           fprintf (stderr, "%s: all paths must be in POSIX format\n",
                    program_name);
-          usage (optCon, stderr, program_name);
+          usage (stderr, program_name);
           return (1);
         }
       strcpy (exe_name, opts.target_arg);
@@ -432,7 +432,7 @@ mkshortcut (optvals opts, poptContext optCon)
               free (buf_str);
               fprintf (stderr, "%s: all paths must be in POSIX format\n",
                        program_name);
-              usage (optCon, stderr, program_name);
+              usage (stderr, program_name);
               return (1);
             }
           cygwin_conv_to_win32_path (opts.dir_name_arg, dir_name);
@@ -480,7 +480,7 @@ mkshortcut (optvals opts, poptContext optCon)
               fprintf (stderr,
                        "%s: absolute pathnames not allowed with -D/-P\n",
                        program_name);
-              usage (optCon, stderr, program_name);
+              usage (stderr, program_name);
               return (1);
             }
         }
@@ -490,7 +490,7 @@ mkshortcut (optvals opts, poptContext optCon)
           free (buf_str);
           fprintf (stderr, "%s: all paths must be in POSIX format\n",
                    program_name);
-          usage (optCon, stderr, program_name);
+          usage (stderr, program_name);
           return (1);
         }
       cygwin_conv_to_win32_path (opts.name_arg, link_name);
@@ -678,13 +678,13 @@ printLicense (FILE * f, char *name)
   fprintf (f, "See the COPYING file for license information.\n");
 }
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -692,14 +692,14 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
   fprintf (f, copyrightID);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/readshortcut/readshortcut.c b/src/readshortcut/readshortcut.c
index f92fb31da1a10cb9203835cbb047f43bbf74dec3..45399f5e4e6e212a37df20d8cd9f68e7e40c5847 100644 (file)
--- a/src/readshortcut/readshortcut.c
+++ b/src/readshortcut/readshortcut.c
@@ -88,20 +88,20 @@ void cygwin_conv_to_full_posix_path (const char *path, char *posix_path);
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 
 void formatPath (char *strPath, int format);
-int readshortcut (optvals * opts, poptContext optContext);
+int readshortcut (optvals * opts);
 
 static char *program_name;
+static poptContext optCon;
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optContext;
   const char **loose_args;
   int rc;
   int result = ERR_NONE;
@@ -186,24 +186,24 @@ main (int argc, const char **argv)
   opts.show_all = 0;
 
   /* set the pOpt context and help line */
-  optContext = poptGetContext (NULL, argc, argv, opt, 0);
-  poptSetOtherOptionHelp (optContext, "[OPTION]* SHORTCUT");
+  optCon = poptGetContext (NULL, argc, argv, opt, 0);
+  poptSetOtherOptionHelp (optCon, "[OPTION]* SHORTCUT");
 
-  while ((rc = poptGetNextOpt (optContext)) > 0)
+  while ((rc = poptGetNextOpt (optCon)) > 0)
     {
       switch (rc)
         {
         case '?':
-          help (optContext, stdout, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optContext, stdout, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optContext, stdout, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optContext, stdout, program_name);
+          license (stdout, program_name);
           goto exit;
         }
     }
@@ -218,7 +218,7 @@ main (int argc, const char **argv)
     }
 
   /* get the remaining arguments */
-  loose_args = poptGetArgs (optContext);
+  loose_args = poptGetArgs (optCon);
 
   if (loose_args && *loose_args)
     {
@@ -237,31 +237,31 @@ main (int argc, const char **argv)
               fprintf (stderr, "%s ", *loose_args++);
             }
           fprintf (stderr, "\n");
-          usage (optContext, stderr, program_name);
+          usage (stderr, program_name);
           result = ERR_USER;
         }
       else
         {
       /************** Main Program ***********/
-          result = readshortcut (&opts, optContext);
+          result = readshortcut (&opts);
         }
     }
   else
     {
       fprintf (stderr, "%s: SHORTCUT not specified\n", program_name);
-      usage (optContext, stderr, program_name);
+      usage (stderr, program_name);
       result = ERR_USER;
     }
 
 exit:
-  poptFreeContext (optContext);
+  poptFreeContext (optCon);
   free (program_name);
   free (opts.target_fname);
   return result;
 }
 
 int
-readshortcut (optvals * opts, poptContext optContext)
+readshortcut (optvals * opts)
 {
   HRESULT hres;
   IShellLink *shell_link;
@@ -531,13 +531,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -545,13 +545,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);

diff --git a/src/realpath/realpath.c b/src/realpath/realpath.c
index 7b5c9791edd6207bf864b394d4a9f30162e23546..1470cd833b5969800b16dc92d7a4f1750bf06052 100644 (file)
--- a/src/realpath/realpath.c
+++ b/src/realpath/realpath.c
@@ -42,19 +42,19 @@ static const char copyrightID[] =
 
 /* The name this program was run with. */
 static char *program_name;
+static poptContext optCon;
 
 static void printTopDescription (FILE * f, char *name);
 static void printBottomDescription (FILE * f, char *name);
 static const char *getVersion (void);
-static void usage (poptContext optCon, FILE * f, char *name);
-static void help (poptContext optCon, FILE * f, char *name);
-static void version (poptContext optCon, FILE * f, char *name);
-static void license (poptContext optCon, FILE * f, char *name);
+static void usage (FILE * f, char *name);
+static void help (FILE * f, char *name);
+static void version (FILE * f, char *name);
+static void license (FILE * f, char *name);
 
 int
 main (int argc, const char **argv)
 {
-  poptContext optCon;
   const char **rest;
   int rc;
   int ec = 0;
@@ -99,16 +99,16 @@ main (int argc, const char **argv)
       switch (rc)
         {
         case '?':
-          help (optCon, stderr, program_name);
+          help (stdout, program_name);
           goto exit;
         case 'u':
-          usage (optCon, stderr, program_name);
+          usage (stdout, program_name);
           goto exit;
         case 'v':
-          version (optCon, stderr, program_name);
+          version (stdout, program_name);
           goto exit;
         case 'l':
-          license (optCon, stderr, program_name);
+          license (stdout, program_name);
           goto exit;
         }
     }
@@ -125,7 +125,7 @@ main (int argc, const char **argv)
   if (rest == NULL)
     {
       fprintf (stderr, "%s: not enough arguments\n", program_name);
-      usage (optCon, stderr, program_name);
+      usage (stderr, program_name);
     }
   else
     {
@@ -138,7 +138,7 @@ main (int argc, const char **argv)
       if (*rest != NULL)
         {                       /* should only have ONE member of **rest  */
           fprintf (stderr, "%s: too many arguments\n", program_name);
-          usage (optCon, stderr, program_name);
+          usage (stderr, program_name);
           free (input);
         }
       else
@@ -214,13 +214,13 @@ printLicense (FILE * f, char *name)
 }
 
 static void
-usage (poptContext optCon, FILE * f, char *name)
+usage (FILE * f, char *name)
 {
   poptPrintUsage (optCon, f, 0);
 }
 
 static void
-help (poptContext optCon, FILE * f, char *name)
+help (FILE * f, char *name)
 {
   printTopDescription (f, name);
   poptPrintHelp (optCon, f, 0);
@@ -228,13 +228,13 @@ help (poptContext optCon, FILE * f, char *name)
 }
 
 static void
-version (poptContext optCon, FILE * f, char *name)
+version (FILE * f, char *name)
 {
   printTopDescription (f, name);
 }
 
 static void
-license (poptContext optCon, FILE * f, char *name)
+license (FILE * f, char *name)
 {
   printTopDescription (f, name);
   printLicense (f, name);