d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow a variable as the first arg to ``set proctitle''.

Browse Source
This commit is contained in:
Brian Somers 1998-12-14 01:15:34 +00:00
parent 80b2397ccf
commit 87766c5694
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/ppp/command.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: command.c,v 1.175 1998/10/31 17:38:46 brian Exp $
* $Id: command.c,v 1.176 1998/11/05 21:59:47 brian Exp $
*
*/
#include <sys/types.h>
@ -134,7 +134,7 @@
#define NEG_DNS 50
const char Version[] = "2.0";
const char VersionDate[] = "$Date: 1998/10/31 17:38:46 $";
const char VersionDate[] = "$Date: 1998/11/05 21:59:47 $";
static int ShowCommand(struct cmdargs const *);
static int TerminalCommand(struct cmdargs const *);
@ -385,14 +385,20 @@ subst(char *tgt, const char *oldstr, const char *newstr)
}
static void
expand(char **nargv, int argc, char const *const *oargv, struct bundle *bundle)
expand(char **nargv, int argc, char const *const *oargv, struct bundle *bundle,
int inc0)
{
int arg;
char pid[12];
nargv[0] = strdup(oargv[0]);
if (inc0)
arg = 0; /* Start at arg 0 */
else {
nargv[0] = strdup(oargv[0]);
arg = 1;
}
snprintf(pid, sizeof pid, "%d", getpid());
for (arg = 1; arg < argc; arg++) {
for (; arg < argc; arg++) {
nargv[arg] = strdup(oargv[arg]);
nargv[arg] = subst(nargv[arg], "HISADDR",
inet_ntoa(bundle->ncp.ipcp.peer_ip));
@ -474,7 +480,7 @@ ShellCommand(struct cmdargs const *arg, int bg)
argc = sizeof argv / sizeof argv[0] - 1;
log_Printf(LogWARN, "Truncating shell command to %d args\n", argc);
}
expand(argv, argc, arg->argv + arg->argn, arg->bundle);
expand(argv, argc, arg->argv + arg->argn, arg->bundle, 0);
if (bg) {
pid_t p;
@ -2442,7 +2448,7 @@ SetProcTitle(struct cmdargs const *arg)
argc = sizeof argv / sizeof argv[0] - 1;
log_Printf(LogWARN, "Truncating proc title to %d args\n", argc);
}
expand(argv, argc, arg->argv + arg->argn, arg->bundle);
expand(argv, argc, arg->argv + arg->argn, arg->bundle, 1);
ptr = title;
remaining = sizeof title - 1;