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

ash: jobs: Replace some uses of fmtstr with stpcpy/stpncpy

Browse Source 
Upstream commit:

    Date: Sat, 19 May 2018 02:39:45 +0800
    jobs: Replace some uses of fmtstr with stpcpy/stpncpy

    Some uses of fmtstr, particularly the ones without a format string,
    can be replaced with stpcpy or stpncpy.  This patch does that so
    we don't have to introduce unnecessary format strings in order to
    silence compiler warnings.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-02-16 18:23:43 +01:00
parent 3f7fb2c89a
commit 2bad3a305b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shell/ash.c
View File

@ -4203,12 +4203,11 @@ fg_bgcmd(int argc UNUSED_PARAM, char **argv)
#endif #endif
static int static int
sprint_status48(char *s, int status, int sigonly) sprint_status48(char *os, int status, int sigonly)
{ {
int col; char *s = os;
int st; int st;
col = 0;
if (!WIFEXITED(status)) { if (!WIFEXITED(status)) {
#if JOBS #if JOBS
if (WIFSTOPPED(status)) if (WIFSTOPPED(status))
@ -4226,17 +4225,17 @@ sprint_status48(char *s, int status, int sigonly)
} }
st &= 0x7f; st &= 0x7f;
//TODO: use bbox's get_signame? strsignal adds ~600 bytes to text+rodata //TODO: use bbox's get_signame? strsignal adds ~600 bytes to text+rodata
col = fmtstr(s, 32, strsignal(st)); //s = stpncpy(s, strsignal(st), 32); //not all libc have stpncpy()
s += fmtstr(s, 32, strsignal(st));
if (WCOREDUMP(status)) { if (WCOREDUMP(status)) {
strcpy(s + col, " (core dumped)"); s = stpcpy(s, " (core dumped)");
col += sizeof(" (core dumped)")-1;
} }
} else if (!sigonly) { } else if (!sigonly) {
st = WEXITSTATUS(status); st = WEXITSTATUS(status);
col = fmtstr(s, 16, (st ? "Done(%d)" : "Done"), st); s += fmtstr(s, 16, (st ? "Done(%d)" : "Done"), st);
} }
out: out:
return col; return s - os;
} }
static int static int