picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PATCH] remove '\n' from end of callout return 

remove possible newline at end of callout output,
  for easier matching with ID=
This commit is contained in:
kay.sievers@vrfy.org 2003-12-15 22:38:18 -08:00 committed by Greg KH
parent 5a3ee97760
commit 2052464275
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
namedev.c
View File

@ -264,7 +264,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
pid_t pid;
int value_set = 0;
char buffer[256];
char *arg;
char *pos;
char *args[CALLOUT_MAXARG];
int i;
@ -286,9 +286,9 @@ static int exec_callout(struct config_device *dev, char *value, int len)
dup(fds[1]); /* dup write side of pipe to STDOUT */
if (strchr(dev->exec_program, ' ')) {
/* callout with arguments */
arg = dev->exec_program;
pos = dev->exec_program;
for (i=0; i < CALLOUT_MAXARG-1; i++) {
args[i] = strsep(&arg, " ");
args[i] = strsep(&pos, " ");
if (args[i] == NULL)
break;
}
@ -324,9 +324,12 @@ static int exec_callout(struct config_device *dev, char *value, int len)
} else {
value_set = 1;
strncpy(value, buffer, len);
pos = value + strlen(value)-1;
if (pos[0] == '\n')
pos[0] = '\0';
dbg("callout returned '%s'", value);
}
}
dbg("callout returned '%s'", value);
close(fds[0]);
res = wait(&status);
if (res < 0) {