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

Commit ad0c2bf5 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

resolve merge conflicts of 7f5da850 to lmp-dev am: de529e72 

am: 1a98776a

* commit '1a98776a':
  Fix scanf %s in lsof.

Change-Id: I1af0d93d03631f257b1372a08aad158508f652ea
parents 0b35da71 1a98776a

toolbox/lsof.c

+4 −3
Original line number Diff line number Diff line
@@ -99,10 +99,11 @@ out: 
static void print_maps(struct pid_info_t* info)

{

    FILE *maps;



    size_t offset;

    char device[10];

    long int inode;

    char file[PATH_MAX];

    char file[1024];



    strlcat(info->path, "maps", sizeof(info->path));
@@ -110,8 +111,8 @@ static void print_maps(struct pid_info_t* info) 
    if (!maps)

        goto out;



    while (fscanf(maps, "%*x-%*x %*s %zx %s %ld %s\n", &offset, device, &inode,

            file) == 4) {

    while (fscanf(maps, "%*x-%*x %*s %zx %5s %ld %1023s\n",

                  &offset, device, &inode, file) == 4) {

        // We don't care about non-file maps

        if (inode == 0 || !strcmp(device, "00:00"))

            continue;