Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 18:15:17 +00:00
Code Issues Releases Activity

exec.cc: Calculate the command length once and compare it, check only the first char once

Browse Source
This commit is contained in:
su8 2018-08-09 14:01:26 +02:00 committed by Brenden Matthews
parent e242fea685
commit 3d5e152a8b
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/exec.cc
View File

@ -48,33 +48,33 @@ struct execi_data {
execi_data() = default; execi_data() = default;
}; };
const int cmd_len = 256; static const int cmd_len = 256;
char cmd[cmd_len]; static char cmd[cmd_len];
static char *escape_quotes(const char *); static char *remove_excess_quotes(const char *);
static char *escape_quotes(const char *command) { static char *remove_excess_quotes(const char *command) {
char *str1 = cmd; char *cmd_ptr = cmd;
const char *str2 = command; const char *command_ptr = command;
int skip = 0; int skip = 0;
int x = 0;
for (; *str2; str2++, x++) { if ((cmd_len - 1) < (strlen(command) - 1)) {
if (0 == skip && 0 == x) { snprintf(cmd, cmd_len - 1, "%s", command);
if (*str2 == '"' || *str2 == '\'') { return cmd;
skip = 1;
continue;
}
}
if ('\0' == *(str2+1) && 1 == skip) {
if (*str2 == '"' || *str2 == '\'') {
continue;
}
}
if ((cmd_len - 1) > x) {
*str1++ = *str2;
}
} }
*str1 = '\0';
if (*command_ptr == '"' || *command_ptr == '\'') {
skip = 1;
command_ptr++;
}
for (; *command_ptr; command_ptr++) {
if ('\0' == *(command_ptr+1) && 1 == skip &&
(*command_ptr == '"' || *command_ptr == '\'')) {
continue;
}
*cmd_ptr++ = *command_ptr;
}
*cmd_ptr = '\0';
return cmd; return cmd;
} }
@ -122,7 +122,7 @@ static FILE *pid_popen(const char *command, const char *mode, pid_t *child) {
if (fcntl(childend, F_DUPFD, 0) == -1) { perror("fcntl()"); } if (fcntl(childend, F_DUPFD, 0) == -1) { perror("fcntl()"); }
close(childend); close(childend);
execl("/bin/sh", "sh", "-c", escape_quotes(command), (char *)nullptr); execl("/bin/sh", "sh", "-c", remove_excess_quotes(command), (char *)nullptr);
_exit(EXIT_FAILURE); // child should die here, (normally execl will take _exit(EXIT_FAILURE); // child should die here, (normally execl will take
// care of this but it can fail) // care of this but it can fail)
} }