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

resolve merge conflicts of 7f5da850 to lmp-dev am: de529e72 am: 1a98776a am: ad0c2bf5 am: a17f2802 am: 20b1e795 am: c443a447
am: 5538f8bb

* commit '5538f8bb':
  Fix scanf %s in lsof.

Change-Id: I09d37fb2798e6038bb00fb8e210b9d3c5348a4e4

toolbox/lsof.c

@@ -100,10 +100,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));
 
@@ -111,8 +112,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;