- /* NB: need to pass size as a double because it might be be
- * too large for a long. */
- printf("%s %12.0f %6d.%-6d %04d-%02d-%02d %02d:%02d:%02d %s\n",
- permbuf, (double) buf.st_size,
- buf.st_uid, buf.st_gid,
- mt->tm_year + 1900,
- mt->tm_mon + 1,
- mt->tm_mday,
- mt->tm_hour,
- mt->tm_min,
- mt->tm_sec,
- fname);
+ printf("%s ", permbuf);
+ if (IS_DEVICE(buf.st_mode)) {
+ printf("%5ld,%6ld",
+ (long)major(buf.st_rdev),
+ (long)minor(buf.st_rdev));
+ } else /* NB: use double for size since it might not fit in a long. */
+ printf("%12.0f", (double)buf.st_size);
+ printf(" %6ld.%-6ld %6ld %s %s%s\n",
+ (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
+ datebuf, fname, linkbuf);