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

adjtimex: zero-fill whole structure, to be on the safe side

Browse Source 
function                                             old     new   delta
adjtimex_main                                        395     406     +11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-06 19:46:21 +02:00
parent a894a4bedd
commit c8e29317e9
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miscutils/adjtimex.c
View File

@ -90,13 +90,14 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
unsigned opt; unsigned opt;
char *opt_o, *opt_f, *opt_p, *opt_t; char *opt_o, *opt_f, *opt_p, *opt_t;
struct timex txc; struct timex txc;
int i, ret; int ret;
const char *descript; const char *descript;
memset(&txc, 0, sizeof(txc));
opt_complementary = "=0"; /* no valid non-option parameters */ opt_complementary = "=0"; /* no valid non-option parameters */
opt = getopt32(argv, "qo:f:p:t:", opt = getopt32(argv, "qo:f:p:t:",
&opt_o, &opt_f, &opt_p, &opt_t); &opt_o, &opt_f, &opt_p, &opt_t);
txc.modes = 0;
//if (opt & 0x1) // -q //if (opt & 0x1) // -q
if (opt & 0x2) { // -o if (opt & 0x2) { // -o
txc.offset = xatol(opt_o); txc.offset = xatol(opt_o);
@ -116,14 +117,13 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
} }
ret = adjtimex(&txc); ret = adjtimex(&txc);
if (ret < 0)
if (ret < 0) {
bb_perror_nomsg_and_die(); bb_perror_nomsg_and_die();
}
if (!(opt & OPT_quiet)) { if (!(opt & OPT_quiet)) {
const char *sep; const char *sep;
const char *name; const char *name;
int i;
printf( printf(
" mode: %d\n" " mode: %d\n"
@ -132,8 +132,9 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
" maxerror: %ld\n" " maxerror: %ld\n"
" esterror: %ld\n" " esterror: %ld\n"
" status: %d (", " status: %d (",
txc.modes, txc.offset, txc.freq, txc.maxerror, txc.modes, txc.offset, txc.freq, txc.maxerror,
txc.esterror, txc.status); txc.esterror, txc.status
);
/* representative output of next code fragment: /* representative output of next code fragment:
* "PLL | PPSTIME" * "PLL | PPSTIME"
@ -159,9 +160,11 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
" time.tv_sec: %ld\n" " time.tv_sec: %ld\n"
" time.tv_usec: %ld\n" " time.tv_usec: %ld\n"
" return value: %d (%s)\n", " return value: %d (%s)\n",
txc.constant, txc.constant,
txc.precision, txc.tolerance, txc.tick, txc.precision, txc.tolerance, txc.tick,
(long)txc.time.tv_sec, (long)txc.time.tv_usec, ret, descript); (long)txc.time.tv_sec, (long)txc.time.tv_usec,
ret, descript
);
} }
return 0; return 0;