shell_cmds-198.tar.gz

[apple/shell_cmds.git] / find / ls.c

diff --git a/find/ls.c b/find/ls.c
index 5e62da8ea58697fd163ef511568104ee65aebc8d..f58d9694275c0c160323916c9d5d8ff028b77bc3 100644 (file)
--- a/find/ls.c
+++ b/find/ls.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,7 @@ static char sccsid[] = "@(#)ls.c      8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/find/ls.c,v 1.19 2009/12/13 03:14:06 delphij Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/find/ls.c,v 1.23 2011/09/28 18:53:36 ed Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -79,8 +75,7 @@ printlong(char *name, char *accpath, struct stat *sb)
            group_from_gid(sb->st_gid, 0));
 
        if (S_ISCHR(sb->st_mode) || S_ISBLK(sb->st_mode))
-               (void)printf("%3d, %3d ", major(sb->st_rdev),
-                   minor(sb->st_rdev));
+               (void)printf("%#8jx ", (uintmax_t)sb->st_rdev);
        else
                (void)printf("%8"PRId64" ", sb->st_size);
        printtime(sb->st_mtime);