source: clfs-embedded/patches/busybox-1.17.3-fixes-1.patch@ 26c7a06

Last change on this file since 26c7a06 was 93539e4, checked in by Joe Ciccone <jciccone@…>, 14 years ago

Updated BusyBox to 1.17.3.
  • Property mode set to 100644
File size: 3.6 KB

  • coreutils/ls.c 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 2010-11-21
Initial Package Version: 1.17.3
Upstream Status: From Upstream
Origin: http://busybox.net/downloads/fixes-1.17.3/
Description: This patch includes the following upstream patches.

             busybox-1.17.3-dnsd.patch
             busybox-1.17.3-iproute.patch
             busybox-1.17.3-ls.patch
             busybox-1.17.3-sort.patch
             busybox-1.17.3-unicode.patch

diff -Naur busybox-1.17.3.orig/coreutils/ls.c busybox-1.17.3/coreutils/ls.c
    old new  
    184184        LIST_INO,                   /* i */
    185185        LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
    186186        LIST_SHORT | STYLE_SINGLE,  /* 1 */
    187         0,                          /* g (don't show group) - handled via OPT_g */
     187        0,                          /* g (don't show owner) - handled via OPT_g */
    188188        LIST_ID_NUMERIC,            /* n */
    189189        LIST_BLOCKS,                /* s */
    190190        DISP_ROWS,                  /* x */
    … …  
    621621        if (all_fmt & LIST_ID_NAME) {
    622622                if (option_mask32 & OPT_g) {
    623623                        column += printf("%-8.8s ",
    624                                 get_cached_username(dn->dstat.st_uid));
     624                                get_cached_groupname(dn->dstat.st_gid));
    625625                } else {
    626626                        column += printf("%-8.8s %-8.8s ",
    627627                                get_cached_username(dn->dstat.st_uid),
    … …  
    631631#endif
    632632        if (all_fmt & LIST_ID_NUMERIC) {
    633633                if (option_mask32 & OPT_g)
    634                         column += printf("%-8u ", (int) dn->dstat.st_uid);
     634                        column += printf("%-8u ", (int) dn->dstat.st_gid);
    635635                else
    636636                        column += printf("%-8u %-8u ",
    637637                                        (int) dn->dstat.st_uid,

  • coreutils/sort.c 

    diff -Naur busybox-1.17.3.orig/coreutils/sort.c busybox-1.17.3/coreutils/sort.c
    old new  
    412412#if ENABLE_FEATURE_SORT_BIG
    413413        /* Open output file _after_ we read all input ones */
    414414        if (option_mask32 & FLAG_o)
    415                 xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
     415                xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
    416416#endif
    417417        flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
    418418        for (i = 0; i < linecount; i++)

  • libbb/unicode.c 

    diff -Naur busybox-1.17.3.orig/libbb/unicode.c busybox-1.17.3/libbb/unicode.c
    old new  
    10061006                        }
    10071007                }
    10081008                if (stats)
    1009                         stats->byte_count = stats->unicode_count = (d - dst);
     1009                        stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
    10101010                return dst;
    10111011        }
    10121012

  • networking/dnsd.c 

    diff -Naur busybox-1.17.3.orig/networking/dnsd.c busybox-1.17.3/networking/dnsd.c
    old new  
    388388        query_len = strlen(query_string) + 1;
    389389        /* may be unaligned! */
    390390        unaligned_type_class = (void *)(query_string + query_len);
    391         query_len += sizeof(unaligned_type_class);
     391        query_len += sizeof(*unaligned_type_class);
    392392        /* where to append answer block */
    393393        answb = (void *)(unaligned_type_class + 1);
    394394

  • networking/libiproute/iproute.c 

    diff -Naur busybox-1.17.3.orig/networking/libiproute/iproute.c busybox-1.17.3/networking/libiproute/iproute.c
    old new  
    791791                                }
    792792                                req.r.rtm_dst_len = addr.bitlen;
    793793                        }
    794                         argv++;
    795794                }
     795                argv++;
    796796        }
    797797
    798798        if (req.r.rtm_dst_len == 0) {
Note: See TracBrowser for help on using the repository browser.