Changeset 51 in kBuild for trunk/src/kmk/util.c

Timestamp:

Apr 7, 2003 1:30:32 AM (22 years ago)

Author:

bird

Message:

kMk and porting to kLib.

File:

• trunk/src/kmk/util.c (modified) (12 diffs)

trunk/src/kmk/util.c

@@ -5 +5 @@
 #ifndef lint
 static char rcsid[] = "$FreeBSD: src/usr.bin/make/util.c,v 1.5.2.2 2001/02/13 03:13:58 will Exp $";
+#define KLIBFILEDEF rcsid
 #endif
 
@@ -27 +28 @@
     static char buf[100];
     if (e < 0 || e >= sys_nerr) {
-        sprintf(buf, "Unknown error %d", e);
-        return buf;
+        sprintf(buf, "Unknown error %d", e);
+        return buf;
     }
     else
-        return sys_errlist[e];
+        return sys_errlist[e];
 }
 #endif
@@ -50 +51 @@
 
     if (str == NULL)
-        return NULL;
+        return NULL;
     len = strlen(str) + 1;
     if ((p = emalloc(len)) == NULL)
-        return NULL;
+        return NULL;
 
     return memcpy(p, str, len);
@@ -60 +61 @@
 #endif
 
-#if defined(sun) || defined(__hpux) || defined(__sgi) || defined(__EMX__) || (defined(OS2) && defined(__IBMC__))
+#ifndef USE_KLIB
+#if defined(sun) || defined(__hpux) || defined(__sgi) || defined(__EMX__)
 
 int
@@ -75 +77 @@
 
     if (ptr == NULL)
-        return -1;
+        return -1;
 
     p = ptr;
 
     while (*name)
-        *p++ = *name++;
+        *p++ = *name++;
 
     *p++ = '=';
 
     while (*value)
-        *p++ = *value++;
+        *p++ = *value++;
 
     *p = '\0';
@@ -93 +95 @@
     return len;
 }
+#endif
 #endif
 
@@ -157 +160 @@
 
 /* strrcpy():
- *      Like strcpy, going backwards and returning the new pointer
+ *      Like strcpy, going backwards and returning the new pointer
  */
 static char *
@@ -166 +169 @@
 
     while (len)
-        *--ptr = str[--len];
+        *--ptr = str[--len];
 
     return (ptr);
@@ -185 +188 @@
     /* find the inode of root */
     if (stat("/", &st_root) == -1) {
-        (void) sprintf(pathname,
-                        "getwd: Cannot stat \"/\" (%s)", strerror(errno));
-        return (NULL);
+        (void) sprintf(pathname,
+                        "getwd: Cannot stat \"/\" (%s)", strerror(errno));
+        return (NULL);
     }
     pathbuf[MAXPATHLEN - 1] = '\0';
@@ -196 +199 @@
     /* find the inode of the current directory */
     if (lstat(".", &st_cur) == -1) {
-        (void) sprintf(pathname,
-                        "getwd: Cannot stat \".\" (%s)", strerror(errno));
-        return (NULL);
+        (void) sprintf(pathname,
+                        "getwd: Cannot stat \".\" (%s)", strerror(errno));
+        return (NULL);
     }
     nextpathptr = strrcpy(nextpathptr, "../");
@@ -205 +208 @@
     for (;;) {
 
-        /* look if we found root yet */
-        if (st_cur.st_ino == st_root.st_ino &&
-            DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
-            (void) strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
-            return (pathname);
-        }
-
-        /* open the parent directory */
-        if (stat(nextpathptr, &st_dotdot) == -1) {
-            snprintf(pathname, sizeof(pathname),
-                            "getwd: Cannot stat directory \"%s\" (%s)",
-                            nextpathptr, strerror(errno));
-            return (NULL);
-        }
-        if ((dp = opendir(nextpathptr)) == NULL) {
-             snprintf(pathname, sizeof(pathname),
-                            "getwd: Cannot open directory \"%s\" (%s)",
-                            nextpathptr, strerror(errno));
-            return (NULL);
-        }
-
-        /* look in the parent for the entry with the same inode */
-        if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) {
-            /* Parent has same device. No need to stat every member */
-            for (d = readdir(dp); d != NULL; d = readdir(dp))
-                if (d->d_fileno == st_cur.st_ino)
-                    break;
-        }
-        else {
-            /*
-             * Parent has a different device. This is a mount point so we
-             * need to stat every member
-             */
-            for (d = readdir(dp); d != NULL; d = readdir(dp)) {
-                if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
-                    continue;
-                (void) strcpy(cur_name_add, d->d_name);
-                if (lstat(nextpathptr, &st_next) == -1) {
-                    snprintf(pathname, sizeof(pathname), "getwd: Cannot stat \"%s\" (%s)",
-                                    d->d_name, strerror(errno));
-                    (void) closedir(dp);
-                    return (NULL);
-                }
-                /* check if we found it yet */
-                if (st_next.st_ino == st_cur.st_ino &&
-                    DEV_DEV_COMPARE(st_next.st_dev, st_cur.st_dev))
-                    break;
-            }
-        }
-        if (d == NULL) {
-            (void) sprintf(pathname, "getwd: Cannot find \".\" in \"..\"");
-            (void) closedir(dp);
-            return (NULL);
-        }
-        st_cur = st_dotdot;
-        pathptr = strrcpy(pathptr, d->d_name);
-        pathptr = strrcpy(pathptr, "/");
-        nextpathptr = strrcpy(nextpathptr, "../");
-        (void) closedir(dp);
-        *cur_name_add = '\0';
+        /* look if we found root yet */
+        if (st_cur.st_ino == st_root.st_ino &&
+            DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
+            (void) strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
+            return (pathname);
+        }
+
+        /* open the parent directory */
+        if (stat(nextpathptr, &st_dotdot) == -1) {
+            snprintf(pathname, sizeof(pathname),
+                            "getwd: Cannot stat directory \"%s\" (%s)",
+                            nextpathptr, strerror(errno));
+            return (NULL);
+        }
+        if ((dp = opendir(nextpathptr)) == NULL) {
+             snprintf(pathname, sizeof(pathname),
+                            "getwd: Cannot open directory \"%s\" (%s)",
+                            nextpathptr, strerror(errno));
+            return (NULL);
+        }
+
+        /* look in the parent for the entry with the same inode */
+        if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) {
+            /* Parent has same device. No need to stat every member */
+            for (d = readdir(dp); d != NULL; d = readdir(dp))
+                if (d->d_fileno == st_cur.st_ino)
+                    break;
+        }
+        else {
+            /*
+             * Parent has a different device. This is a mount point so we
+             * need to stat every member
+             */
+            for (d = readdir(dp); d != NULL; d = readdir(dp)) {
+                if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
+                    continue;
+                (void) strcpy(cur_name_add, d->d_name);
+                if (lstat(nextpathptr, &st_next) == -1) {
+                    snprintf(pathname, sizeof(pathname), "getwd: Cannot stat \"%s\" (%s)",
+                                    d->d_name, strerror(errno));
+                    (void) closedir(dp);
+                    return (NULL);
+                }
+                /* check if we found it yet */
+                if (st_next.st_ino == st_cur.st_ino &&
+                    DEV_DEV_COMPARE(st_next.st_dev, st_cur.st_dev))
+                    break;
+            }
+        }
+        if (d == NULL) {
+            (void) sprintf(pathname, "getwd: Cannot find \".\" in \"..\"");
+            (void) closedir(dp);
+            return (NULL);
+        }
+        st_cur = st_dotdot;
+        pathptr = strrcpy(pathptr, d->d_name);
+        pathptr = strrcpy(pathptr, "/");
+        nextpathptr = strrcpy(nextpathptr, "../");
+        (void) closedir(dp);
+        *cur_name_add = '\0';
     }
 } /* end getwd */
@@ -336 +339 @@
 
     if (sigaction(s, &sa, &osa) == -1)
-        return SIG_ERR;
+        return SIG_ERR;
     else
-        return osa.sa_handler;
-}
-
-#endif
+        return osa.sa_handler;
+}
+
+#endif