Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e362c87 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 71e096c8: Merge "Increase buffer size, use bounds checking functions" 

* commit '71e096c8':
  Increase buffer size, use bounds checking functions
parents 79fb7be4 71e096c8

toolbox/ls.c

+16 −16
Original line number Diff line number Diff line
@@ -75,23 +75,23 @@ static void mode2str(unsigned mode, char *out) 
    *out = 0;

}



static void user2str(unsigned uid, char *out)

static void user2str(uid_t uid, char *out, size_t out_size)

{

    struct passwd *pw = getpwuid(uid);

    if(pw) {

        strcpy(out, pw->pw_name);

        strlcpy(out, pw->pw_name, out_size);

    } else {

        sprintf(out, "%d", uid);

        snprintf(out, out_size, "%d", uid);

    }

}



static void group2str(unsigned gid, char *out)

static void group2str(gid_t gid, char *out, size_t out_size)

{

    struct group *gr = getgrgid(gid);

    if(gr) {

        strcpy(out, gr->gr_name);

        strlcpy(out, gr->gr_name, out_size);

    } else {

        sprintf(out, "%d", gid);

        snprintf(out, out_size, "%d", gid);

    }

}
@@ -164,8 +164,8 @@ static int listfile_long(const char *path, struct stat *s, int flags) 
{

    char date[32];

    char mode[16];

    char user[16];

    char group[16];

    char user[32];

    char group[32];

    const char *name;



    if(!s || !path) {
@@ -182,11 +182,11 @@ static int listfile_long(const char *path, struct stat *s, int flags) 


    mode2str(s->st_mode, mode);

    if (flags & LIST_LONG_NUMERIC) {

        sprintf(user, "%ld", s->st_uid);

        sprintf(group, "%ld", s->st_gid);

        snprintf(user, sizeof(user), "%ld", s->st_uid);

        snprintf(group, sizeof(group), "%ld", s->st_gid);

    } else {

        user2str(s->st_uid, user);

        group2str(s->st_gid, group);

        user2str(s->st_uid, user, sizeof(user));

        group2str(s->st_gid, group, sizeof(group));

    }



    strftime(date, 32, "%Y-%m-%d %H:%M", localtime((const time_t*)&s->st_mtime));
@@ -238,8 +238,8 @@ static int listfile_long(const char *path, struct stat *s, int flags) 
static int listfile_maclabel(const char *path, struct stat *s, int flags)

{

    char mode[16];

    char user[16];

    char group[16];

    char user[32];

    char group[32];

    char *maclabel = NULL;

    const char *name;
@@ -261,8 +261,8 @@ static int listfile_maclabel(const char *path, struct stat *s, int flags) 
    }



    mode2str(s->st_mode, mode);

    user2str(s->st_uid, user);

    group2str(s->st_gid, group);

    user2str(s->st_uid, user, sizeof(user));

    group2str(s->st_gid, group, sizeof(group));



    switch(s->st_mode & S_IFMT) {

    case S_IFLNK: {