system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't munge ``set dial|login|logout|hangup'' arguments before

Browse source 
ExpandString() has a chance to do its own substitutions.
This commit is contained in:
Brian Somers 1999-12-22 21:48:12 +00:00
parent 1107842229
commit abab7303b5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55013
7 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr.sbin/ppp/auth.c
View file

@ -117,7 +117,7 @@ auth_SetPhoneList(const char *name, char *phone, int phonelen)
continue;
buff[strlen(buff) - 1] = '\0';
memset(vector, '\0', sizeof vector);
if ((n = MakeArgs(buff, vector, VECSIZE(vector))) < 0)
if ((n = MakeArgs(buff, vector, VECSIZE(vector), 1)) < 0)
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
if (n < 5)
continue;
@ -168,7 +168,7 @@ auth_Select(struct bundle *bundle, const char *name)
continue;
buff[strlen(buff) - 1] = '\0';
memset(vector, '\0', sizeof vector);
if ((n = MakeArgs(buff, vector, VECSIZE(vector))) < 0)
if ((n = MakeArgs(buff, vector, VECSIZE(vector), 1)) < 0)
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
if (n < 2)
continue;
@ -227,7 +227,7 @@ auth_Validate(struct bundle *bundle, const char *name,
continue;
buff[strlen(buff) - 1] = 0;
memset(vector, '\0', sizeof vector);
if ((n = MakeArgs(buff, vector, VECSIZE(vector))) < 0)
if ((n = MakeArgs(buff, vector, VECSIZE(vector), 1)) < 0)
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
if (n < 2)
continue;
@ -271,7 +271,7 @@ auth_GetSecret(struct bundle *bundle, const char *name, int len,
if (buff[n] == '\n')
buff[n] = '\0'; /* Trim the '\n' */
memset(vector, '\0', sizeof vector);
if ((n = MakeArgs(buff, vector, VECSIZE(vector))) < 0)
if ((n = MakeArgs(buff, vector, VECSIZE(vector), 1)) < 0)
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
if (n < 2)
continue;

4
usr.sbin/ppp/chat.c
View file

@ -561,7 +561,7 @@ chat_Setup(struct chat *c, const char *data, const char *phone)
} else {
strncpy(c->script, data, sizeof c->script - 1);
c->script[sizeof c->script - 1] = '\0';
c->argc = MakeArgs(c->script, c->argv, VECSIZE(c->argv));
c->argc = MakeArgs(c->script, c->argv, VECSIZE(c->argv), 0);
}
c->arg = -1;
@ -702,7 +702,7 @@ ExecStr(struct physical *physical, char *command, char *out, int olen)
int stat, nb, argc, i;
log_Printf(LogCHAT, "Exec: %s\n", command);
if ((argc = MakeArgs(command, vector, VECSIZE(vector))) <= 0) {
if ((argc = MakeArgs(command, vector, VECSIZE(vector), 1)) <= 0) {
if (argc < 0)
log_Printf(LogWARN, "Syntax error in exec command\n");
*out = '\0';

2
usr.sbin/ppp/command.c
View file

@ -913,7 +913,7 @@ command_Interpret(char *buff, int nb, char *argv[MAXARGS])
cp = buff + strcspn(buff, "\r\n");
if (cp)
*cp = '\0';
return MakeArgs(buff, argv, MAXARGS);
return MakeArgs(buff, argv, MAXARGS, 1);
}
return 0;
}

15
usr.sbin/ppp/defs.c
View file

@ -264,13 +264,16 @@ IntToSpeed(int nspeed)
}
char *
findblank(char *p, int instring)
findblank(char *p, int instring, int reduce)
{
while (*p) {
if (*p == '\\') {
memmove(p, p + 1, strlen(p));
if (!*p)
break;
if (reduce) {
memmove(p, p + 1, strlen(p));
if (!*p)
break;
} else
p++;
} else if ((instring && *p == '"') ||
(!instring && (issep(*p) || *p == '#')))
return p;
@ -281,7 +284,7 @@ findblank(char *p, int instring)
}
int
MakeArgs(char *script, char **pvect, int maxargs)
MakeArgs(char *script, char **pvect, int maxargs, int reduce)
{
int nargs, nb;
int instring;
@ -303,7 +306,7 @@ MakeArgs(char *script, char **pvect, int maxargs)
break;
*pvect++ = script;
nargs++;
script = findblank(script, instring);
script = findblank(script, instring, reduce);
if (script == NULL)
return -1;
else if (*script == '#')

4
usr.sbin/ppp/defs.h
View file

@ -98,5 +98,5 @@ extern int Nam2mode(const char *);
extern struct in_addr GetIpAddr(const char *);
extern int SpeedToInt(speed_t);
extern speed_t IntToSpeed(int);
extern char *findblank(char *, int);
extern int MakeArgs(char *, char **, int);
extern char *findblank(char *, int, int);
extern int MakeArgs(char *, char **, int, int);

2
usr.sbin/ppp/exec.c
View file

@ -141,7 +141,7 @@ exec_Create(struct physical *p)
log_Printf(LogDEBUG, "Exec'ing ``%s''\n", p->name.base);
if ((argc = MakeArgs(p->name.base, argv, VECSIZE(argv))) < 0) {
if ((argc = MakeArgs(p->name.base, argv, VECSIZE(argv), 1)) < 0) {
log_Printf(LogWARN, "Syntax error in exec command\n");
_exit(127);
}

2
usr.sbin/ppp/systems.c
View file

@ -320,7 +320,7 @@ ReadSystem(struct bundle *bundle, const char *name, const char *file,
break;
default:
if ((wp = findblank(cp, 0)) != NULL) {
if ((wp = findblank(cp, 0, 1)) != NULL) {
while (issep(*wp))
*wp++ = '\0';
if (*wp == '#')