This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / usr.bin / file / fsmagic.c

diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 63197ca..69caf23 100644 (file)
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -26,7 +26,11 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+#include <string.h>

 #include <sys/types.h>
 #include <sys/types.h>

+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>

 #ifndef        major                   /* if `major' not defined in types.h, */
 #include <sys/sysmacros.h>     /* try this one. */
 #endif
 #ifndef        major                   /* if `major' not defined in types.h, */
 #include <sys/sysmacros.h>     /* try this one. */
 #endif


@@ -35,55 +39,57 @@
                /* On most systems cpp will discard it automatically */
                Congratulations, you have found a portability bug.
                Please grep /usr/include/sys and edit the above #include 
                /* On most systems cpp will discard it automatically */
                Congratulations, you have found a portability bug.
                Please grep /usr/include/sys and edit the above #include 

-               to point at the file that defines the major macro.
+               to point at the file that defines the "major" macro.

 #endif /*major*/
 #endif /*major*/

-#include <sys/stat.h>
+

 #include "file.h"
 
 #ifndef        lint
 static char *moduleid = 
 #include "file.h"
 
 #ifndef        lint
 static char *moduleid = 

-       "@(#)$Header: fsmagic.c,v 1.8 88/01/15 12:13:52 ian Exp $";
+       "@(#)fsmagic.c,v 1.3 1993/06/10 00:38:10 jtc Exp";

 #endif /* lint */
 
 #endif /* lint */
 

-extern char *progname;
-extern char *ckfmsg, *magicfile;
-extern int debug;
-extern FILE *efopen();
-
-fsmagic(fn)
-char *fn;
+int
+fsmagic(fn, sb)
+const char *fn;
+struct stat *sb;

 {
 {

-       extern struct stat statbuf;
+       int ret = 0;

 
        /*
         * Fstat is cheaper but fails for files you don't have read perms on.
 
        /*
         * Fstat is cheaper but fails for files you don't have read perms on.

-        * On 4.2BSD and similar systems, use lstat() so identify symlinks.
+        * On 4.2BSD and similar systems, use lstat() to identify symlinks.

         */
 #ifdef S_IFLNK
         */
 #ifdef S_IFLNK

-       if (lstat(fn, &statbuf) <0)
-#else
-       if (stat(fn, &statbuf) <0)
+       if (!lflag)
+               ret = lstat(fn, sb);
+       else

 #endif
 #endif

-               {
-                       warning("can't stat", "");
-                       return -1;
-               }
+       ret = stat(fn, sb);     /* don't merge into if; see "ret =" above */

 
 

-       if (statbuf.st_mode & S_ISUID) ckfputs("setuid ", stdout);
-       if (statbuf.st_mode & S_ISGID) ckfputs("setgid ", stdout);
-       if (statbuf.st_mode & S_ISVTX) ckfputs("sticky ", stdout);
+       if (ret) {
+               ckfprintf(stdout,
+                       /* Yes, I do mean stdout. */
+                       /* No \n, caller will provide. */
+                       "can't stat `%s' (%s).", fn, strerror(errno));
+               return 1;
+       }
+
+       if (sb->st_mode & S_ISUID) ckfputs("setuid ", stdout);
+       if (sb->st_mode & S_ISGID) ckfputs("setgid ", stdout);
+       if (sb->st_mode & S_ISVTX) ckfputs("sticky ", stdout);

        
        

-       switch (statbuf.st_mode & S_IFMT) {
+       switch (sb->st_mode & S_IFMT) {

        case S_IFDIR:
                ckfputs("directory", stdout);
                return 1;
        case S_IFCHR:
                (void) printf("character special (%d/%d)",
        case S_IFDIR:
                ckfputs("directory", stdout);
                return 1;
        case S_IFCHR:
                (void) printf("character special (%d/%d)",

-                       major(statbuf.st_rdev), minor(statbuf.st_rdev));
+                       major(sb->st_rdev), minor(sb->st_rdev));

                return 1;
        case S_IFBLK:
                (void) printf("block special (%d/%d)",
                return 1;
        case S_IFBLK:
                (void) printf("block special (%d/%d)",

-                       major(statbuf.st_rdev), minor(statbuf.st_rdev));
+                       major(sb->st_rdev), minor(sb->st_rdev));

                return 1;
        /* TODO add code to handle V7 MUX and Blit MUX files */
 #ifdef S_IFIFO
                return 1;
        /* TODO add code to handle V7 MUX and Blit MUX files */
 #ifdef S_IFIFO


@@ -93,7 +99,55 @@ char *fn;
 #endif
 #ifdef S_IFLNK
        case S_IFLNK:
 #endif
 #ifdef S_IFLNK
        case S_IFLNK:

-               ckfputs("symbolic link", stdout);
+               {
+                       char buf[BUFSIZ+4];
+                       register int nch;
+                       struct stat tstatbuf;
+
+                       if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
+                               ckfprintf(stdout, "unreadable symlink (%s).", 
+                                     strerror(errno));
+                               return 1;
+                       }
+                       buf[nch] = '\0';        /* readlink(2) forgets this */
+
+                       /* If broken symlink, say so and quit early. */
+                       if (*buf == '/') {
+                           if (stat(buf, &tstatbuf) < 0) {
+                               ckfprintf(stdout,
+                                       "broken symbolic link to %s", buf);
+                               return 1;
+                           }
+                       }
+                       else {
+                           char *tmp;
+                           char buf2[BUFSIZ+BUFSIZ+4];
+
+                           if ((tmp = strrchr(fn,  '/')) == NULL) {
+                               tmp = buf; /* in current directory anyway */
+                           }
+                           else {
+                               strcpy (buf2, fn);  /* take directory part */
+                               buf2[tmp-fn+1] = '\0';
+                               strcat (buf2, buf); /* plus (relative) symlink */
+                               tmp = buf2;
+                           }
+                           if (stat(tmp, &tstatbuf) < 0) {
+                               ckfprintf(stdout,
+                                       "broken symbolic link to %s", buf);
+                               return 1;
+                           }
+                        }
+
+                       /* Otherwise, handle it. */
+                       if (lflag) {
+                               process(buf, strlen(buf));
+                               return 1;
+                       } else { /* just print what it points to */
+                               ckfputs("symbolic link to ", stdout);
+                               ckfputs(buf, stdout);
+                       }
+               }

                return 1;
 #endif
 #ifdef S_IFSOCK
                return 1;
 #endif
 #ifdef S_IFSOCK


@@ -104,13 +158,14 @@ char *fn;
        case S_IFREG:
                break;
        default:
        case S_IFREG:
                break;
        default:

-               warning("invalid st_mode %d in statbuf!", statbuf.st_mode);
+               error("invalid mode 0%o.\n", sb->st_mode);
+               /*NOTREACHED*/

        }
 
        /*
         * regular file, check next possibility
         */
        }
 
        /*
         * regular file, check next possibility
         */

-       if (statbuf.st_size == 0) {
+       if (sb->st_size == 0) {

                ckfputs("empty", stdout);
                return 1;
        }
                ckfputs("empty", stdout);
                return 1;
        }