attempt to regularize atoi mess.
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index e629bec..f735d9f 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -43,7 +43,6 @@
int i, n, lastc;
char *start;
-
{
unsigned opt;
@@ -52,7 +51,7 @@
if (opt & OPT_LEVEL) {
/* Valid levels are between 1 and 8 */
- console_log_level = bb_xgetlarg(start, 10, 1, 8);
+ console_log_level = xatoul_range(start, 1, 8);
}
if (!(opt & OPT_FOREGROUND)) {
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 15a4bfb..8901bd7 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -48,14 +48,14 @@
CODE *c;
if (isdigit(*name))
- return (atoi(name));
+ return atoi(name);
for (c = codetab; c->c_name; c++) {
if (!strcasecmp(name, c->c_name)) {
- return (c->c_val);
+ return c->c_val;
}
}
- return (-1);
+ return -1;
}
/* Decode a symbolic name to a numeric value
@@ -177,6 +177,3 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
-
-
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 254d7e7..9e030bd 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -575,20 +575,20 @@
/* do normal option parsing */
getopt32(argc, argv, OPTION_STR, OPTION_PARAM);
- if (option_mask32 & OPT_mark) MarkInterval = atoi(opt_m) * 60; // -m
+ if (option_mask32 & OPT_mark) MarkInterval = xatoul_range(opt_m, 0, INT_MAX/60) * 60; // -m
//if (option_mask32 & OPT_nofork) // -n
//if (option_mask32 & OPT_outfile) // -O
if (option_mask32 & OPT_loglevel) { // -l
- logLevel = atoi(opt_l);
+ logLevel = xatoi_u(opt_l);
/* Valid levels are between 1 and 8 */
if (logLevel < 1 || logLevel > 8)
bb_show_usage();
}
//if (option_mask32 & OPT_small) // -S
#if ENABLE_FEATURE_ROTATE_LOGFILE
- if (option_mask32 & OPT_filesize) logFileSize = atoi(opt_s) * 1024; // -s
+ if (option_mask32 & OPT_filesize) logFileSize = xatoul_range(opt_s, 0, INT_MAX/1024) * 1024; // -s
if (option_mask32 & OPT_rotatecnt) { // -b
- logFileRotate = atoi(opt_b);
+ logFileRotate = xatoi_u(opt_b);
if (logFileRotate > 99) logFileRotate = 99;
}
#endif
@@ -598,7 +598,7 @@
char *host = xstrdup(opt_R);
p = strchr(host, ':');
if (p) {
- port = atoi(p + 1);
+ port = xatou16(p + 1);
*p = '\0';
}
remoteaddr.sin_family = AF_INET;
@@ -612,9 +612,7 @@
#if ENABLE_FEATURE_IPC_SYSLOG
if (option_mask32 & OPT_circularlog) { // -C
if (opt_C) {
- int buf_size = atoi(opt_C);
- if (buf_size >= 4)
- shm_size = buf_size * 1024;
+ shm_size = xatoul_range(opt_C, 4, INT_MAX/1024) * 1024;
}
}
#endif