emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more "if (p) free(p)" fixes; fix a typo in comment

Browse Source
This commit is contained in:
Denis Vlasenko 2007-09-28 22:13:55 +00:00
parent 6081868ee3
commit ab8c9378c9
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/getopt32.c
View File

@ -30,7 +30,7 @@ getopt32(char **argv, const char *applet_opts, ...)
"r" will add 1 (bit 0) "r" will add 1 (bit 0)
"n" will add 2 (bit 1) "n" will add 2 (bit 1)
"u will add 4 (bit 2) "u" will add 4 (bit 2)
"g" will add 8 (bit 3) "g" will add 8 (bit 3)
and so on. You can also look at the return value as a bit and so on. You can also look at the return value as a bit

18
libbb/procps.c
View File

@ -353,14 +353,10 @@ procps_status_t *procps_scan(procps_status_t* sp, int flags)
#if 0 /* PSSCAN_CMD is not used */ #if 0 /* PSSCAN_CMD is not used */
if (flags & (PSSCAN_CMD|PSSCAN_ARGV0)) { if (flags & (PSSCAN_CMD|PSSCAN_ARGV0)) {
if (sp->argv0) { free(sp->argv0);
free(sp->argv0); sp->argv0 = NULL;
sp->argv0 = NULL; free(sp->cmd);
} sp->cmd = NULL;
if (sp->cmd) {
free(sp->cmd);
sp->cmd = NULL;
}
strcpy(filename_tail, "/cmdline"); strcpy(filename_tail, "/cmdline");
/* TODO: to get rid of size limits, read into malloc buf, /* TODO: to get rid of size limits, read into malloc buf,
* then realloc it down to real size. */ * then realloc it down to real size. */
@ -380,10 +376,8 @@ procps_status_t *procps_scan(procps_status_t* sp, int flags)
} }
#else #else
if (flags & PSSCAN_ARGV0) { if (flags & PSSCAN_ARGV0) {
if (sp->argv0) { free(sp->argv0);
free(sp->argv0); sp->argv0 = NULL;
sp->argv0 = NULL;
}
strcpy(filename_tail, "/cmdline"); strcpy(filename_tail, "/cmdline");
n = read_to_buf(filename, buf); n = read_to_buf(filename, buf);
if (n <= 0) if (n <= 0)