Merge pull request #3267 from orestisf1993/cmd_shmlog

cmd_shmlog: use parse_long()
This commit is contained in:
Ingo Bürk 2018-04-27 08:38:29 +02:00 committed by GitHub
commit 19596981a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions

View File

@ -2164,21 +2164,22 @@ void cmd_shmlog(I3_CMD, const char *argument) {
else if (!strcmp(argument, "off")) else if (!strcmp(argument, "off"))
shmlog_size = 0; shmlog_size = 0;
else { else {
long new_size = 0;
if (!parse_long(argument, &new_size, 0)) {
yerror("Failed to parse %s into a shmlog size.\n", argument);
return;
}
/* If shm logging now, restart logging with the new size. */ /* If shm logging now, restart logging with the new size. */
if (shmlog_size > 0) { if (shmlog_size > 0) {
shmlog_size = 0; shmlog_size = 0;
LOG("Restarting shm logging...\n"); LOG("Restarting shm logging...\n");
init_logging(); init_logging();
} }
shmlog_size = atoi(argument); shmlog_size = (int)new_size;
/* Make a weakly attempt at ensuring the argument is valid. */
if (shmlog_size <= 0)
shmlog_size = default_shmlog_size;
} }
LOG("%s shm logging\n", shmlog_size > 0 ? "Enabling" : "Disabling"); LOG("%s shm logging\n", shmlog_size > 0 ? "Enabling" : "Disabling");
init_logging(); init_logging();
update_shmlog_atom(); update_shmlog_atom();
// XXX: default reply for now, make this a better reply
ysuccess(true); ysuccess(true);
} }