openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of 7f5da85 to lmp-dev 

Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907
This commit is contained in:
Elliott Hughes 2016-05-24 15:23:48 -07:00
parent ad431d2e2e 7f5da85015
commit de529e72b6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolbox/lsof.c
View File

@ -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;