less -> more

[unix-history] / usr / src / usr.bin / dirname / dirname.c

diff --git a/usr/src/usr.bin/dirname/dirname.c b/usr/src/usr.bin/dirname/dirname.c
index aa85c79..187631e 100644 (file)
--- a/usr/src/usr.bin/dirname/dirname.c
+++ b/usr/src/usr.bin/dirname/dirname.c
@@ -3,11 +3,16 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -17,18 +22,28 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)dirname.c  5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)dirname.c  5.4 (Berkeley) %G%";

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

+#include <stdio.h>
+

 main(argc, argv)
        int argc;
        char **argv;
 {
        char *p, *rindex();
 
 main(argc, argv)
        int argc;
        char **argv;
 {
        char *p, *rindex();
 

-       p = rindex(*++argv, '/');
-       if (p && p > *argv)
-               *p = '\0';
-       puts(*argv);
+       if (argc != 2) {
+               fprintf(stderr, "usage: dirname path\n");
+               exit(1);
+       }
+       if (p = rindex(*++argv, '/'))
+               if (p > *argv)
+                       *p = '\0';
+               else
+                       *++p = '\0';
+       else
+               *argv = ".";
+       printf("%s\n", *argv);

        exit(0);
 }
        exit(0);
 }