Changeset 370 for trunk/src/gmake/kmkbuiltin/ln.c

Timestamp:

Dec 18, 2005, 4:48:02 AM (20 years ago)

Author:

bird

Message:

o Ported all kmk builtins to win32.
o Fixed serveral bugs in kmk builtins.
o Probably broke both linux, bsd and OS/2. :-)

File:

• trunk/src/gmake/kmkbuiltin/ln.c (modified) (10 diffs)

trunk/src/gmake/kmkbuiltin/ln.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)ln.c        8.2 (Berkeley) 3/31/94";
 #endif /* not lint */
-#endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $");
-
+#endif /* no $id */
+
+#ifndef _MSC_VER
 #include <sys/param.h>
+#endif 
 #include <sys/stat.h>
 
-#include <err.h>
+#include "err.h"
 #include <errno.h>
 #include <limits.h>
@@ -51 +53 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif 
 
 static int      fflag;                          /* Unlink existing files. */
@@ -63 +69 @@
 
 static int      linkit(const char *, const char *, int);
-static void     usage(void);
+static int      usage(void);
+
 
 int
@@ -72 +79 @@
         int ch, exitval;
 
+        /* kmk: reset getopt() and set program name. */
+        g_progname = argv[0];
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+#if defined(__FreeBSD__) || defined(__EMX__)
+        optreset = 1;
+        optind = 1;
+#else
+        optind = 0; /* init */
+#endif 
+
+#if 0 /* kmk: we don't need this. */
         /*
          * Test for the special case where the utility is called as
@@ -83 +103 @@
         if (strcmp(p, "link") == 0) {
                 while (getopt(argc, argv, "") != -1)
-                        usage();
+                        return usage();
                 argc -= optind;
                 argv += optind;
                 if (argc != 2)
-                        usage();
+                        return usage();
                 linkf = link;
-                exit(linkit(argv[0], argv[1], 0));
-        }
+                return linkit(argv[0], argv[1], 0);
+        }
+#else
+        (void)p;
+#endif
+        
 
         while ((ch = getopt(argc, argv, "fhinsv")) != -1)
@@ -114 +138 @@
                 case '?':
                 default:
-                        usage();
+                        return usage();
                 }
 
@@ -125 +149 @@
         switch(argc) {
         case 0:
-                usage();
+                return usage();
                 /* NOTREACHED */
         case 1:                         /* ln target */
-                exit(linkit(argv[0], ".", 1));
+                return linkit(argv[0], ".", 1);
         case 2:                         /* ln target source */
-                exit(linkit(argv[0], argv[1], 0));
+                return linkit(argv[0], argv[1], 0);
         default:
                 ;
@@ -142 +166 @@
                  */
                 errno = ENOTDIR;
-                err(1, "%s", sourcedir);
+                return err(1, "%s", sourcedir);
         }
         if (stat(sourcedir, &sb))
-                err(1, "%s", sourcedir);
+                return err(1, "%s", sourcedir);
         if (!S_ISDIR(sb.st_mode))
-                usage();
+                return usage();
         for (exitval = 0; *argv != sourcedir; ++argv)
                 exitval |= linkit(*argv, sourcedir, 1);
-        exit(exitval);
+        return exitval;
 }
 
-int
+static int
 linkit(const char *target, const char *source, int isdir)
 {
@@ -233 +257 @@
 }
 
-void
+static int
 usage(void)
 {
@@ -240 +264 @@
             "       ln [-fhinsv] source_file ... target_dir",
             "       link source_file target_file");
-        exit(1);
+        return 1;
 }