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

change interface to bb_xasprintf() - more perfect for me.

Browse Source 
ln.c: error_msg(str)->error_msg(%s, str) - remove standart "feature" for hackers
reduce 100 bytes don't care in sum
This commit is contained in:
"Vladimir N. Oleynik"
2005-09-29 16:18:57 +00:00
parent 6a60c821a8
commit 39a841cecf
16 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e2fsprogs/fsck.c
View File

@ -363,7 +363,6 @@ static char *find_fsck(char *type)
{
char *s;
const char *tpl;
char *prog;
char *p = string_copy(fsck_path);
struct stat st;
@ -371,12 +370,12 @@ static char *find_fsck(char *type)
tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s");
for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
bb_xasprintf(&prog, tpl, s, type);
if (stat(prog, &st) == 0) break;
free(prog);
s = bb_xasprintf(tpl, s, type);
if (stat(s, &st) == 0) break;
free(s);
}
free(p);
return(s ? prog : NULL);
return(s);
}
static int progress_active(void)
@ -410,7 +409,7 @@ static int execute(const char *type, const char *device, const char *mntpt,
return ENOMEM;
memset(inst, 0, sizeof(struct fsck_instance));
bb_xasprintf(&prog, "fsck.%s", type);
prog = bb_xasprintf("fsck.%s", type);
argv[0] = prog;
argc = 1;
@ -1189,7 +1188,7 @@ int fsck_main(int argc, char *argv[])
/* Update our search path to include uncommon directories. */
if (oldpath) {
bb_xasprintf(&fsck_path, "%s:%s", fsck_prefix_path, oldpath);
fsck_path = bb_xasprintf("%s:%s", fsck_prefix_path, oldpath);
} else {
fsck_path = string_copy(fsck_prefix_path);
}

5
e2fsprogs/mke2fs.c
View File

@ -794,10 +794,7 @@ static int PRS(int argc, char *argv[])
/* Update our PATH to include /sbin */
if (oldpath) {
char *newpath;
bb_xasprintf(&newpath, "%s:%s", PATH_SET, oldpath);
putenv(newpath);
putenv (bb_xasprintf("%s:%s", PATH_SET, oldpath));
} else
putenv (PATH_SET);