Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mkinitrd-magellan/busybox/coreutils/ls.c

    Diff of /trunk/mkinitrd-magellan/busybox/coreutils/ls.c

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1178 by niro, Wed Aug 18 21:56:57 2010 UTC revision 1179 by niro, Wed Dec 15 21:33:41 2010 UTC
    # Line 184  static const unsigned opt_flags[] = { Line 184  static const unsigned opt_flags[] = {
    184   LIST_INO,                   /* i */   LIST_INO,                   /* i */
    185   LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */   LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
    186   LIST_SHORT | STYLE_SINGLE,  /* 1 */   LIST_SHORT | STYLE_SINGLE,  /* 1 */
    187   0,                          /* g (don't show group) - handled via OPT_g */   0,                          /* g (don't show owner) - handled via OPT_g */
    188   LIST_ID_NUMERIC,            /* n */   LIST_ID_NUMERIC,            /* n */
    189   LIST_BLOCKS,                /* s */   LIST_BLOCKS,                /* s */
    190   DISP_ROWS,                  /* x */   DISP_ROWS,                  /* x */
    # Line 621  static NOINLINE unsigned list_single(con Line 621  static NOINLINE unsigned list_single(con
    621   if (all_fmt & LIST_ID_NAME) {   if (all_fmt & LIST_ID_NAME) {
    622   if (option_mask32 & OPT_g) {   if (option_mask32 & OPT_g) {
    623   column += printf("%-8.8s ",   column += printf("%-8.8s ",
    624   get_cached_username(dn->dstat.st_uid));   get_cached_groupname(dn->dstat.st_gid));
    625   } else {   } else {
    626   column += printf("%-8.8s %-8.8s ",   column += printf("%-8.8s %-8.8s ",
    627   get_cached_username(dn->dstat.st_uid),   get_cached_username(dn->dstat.st_uid),
    # Line 631  static NOINLINE unsigned list_single(con Line 631  static NOINLINE unsigned list_single(con
    631  #endif  #endif
    632   if (all_fmt & LIST_ID_NUMERIC) {   if (all_fmt & LIST_ID_NUMERIC) {
    633   if (option_mask32 & OPT_g)   if (option_mask32 & OPT_g)
    634   column += printf("%-8u ", (int) dn->dstat.st_uid);   column += printf("%-8u ", (int) dn->dstat.st_gid);
    635   else   else
    636   column += printf("%-8u %-8u ",   column += printf("%-8u %-8u ",
    637   (int) dn->dstat.st_uid,   (int) dn->dstat.st_uid,
    Legend:
    Removed from v.1178  
    changed lines
      Added in v.1179