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

Understand double-quotes anywhere on a command line in the same

Browse Source 
way that a shell does.  The previous way ppp did it just didn't
make any sense.
This commit is contained in:
Brian Somers 1999-12-23 21:43:12 +00:00
parent 90e7fb01df
commit 1bbd8362c7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55065
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/ppp/defs.c
View File

@ -264,8 +264,11 @@ IntToSpeed(int nspeed)
}
char *
findblank(char *p, int instring, int reduce)
findblank(char *p, int reduce)
{
int instring;
instring = 0;
while (*p) {
if (*p == '\\') {
if (reduce) {
@ -274,8 +277,11 @@ findblank(char *p, int instring, int reduce)
break;
} else
p++;
} else if ((instring && *p == '"') ||
(!instring && (issep(*p) || *p == '#')))
} else if (*p == '"') {
memmove(p, p + 1, strlen(p));
instring = !instring;
continue;
} else if (!instring && (issep(*p) || *p == '#'))
return p;
p++;
}
@ -286,27 +292,17 @@ findblank(char *p, int instring, int reduce)
int
MakeArgs(char *script, char **pvect, int maxargs, int reduce)
{
int nargs, nb;
int instring;
int nargs;
nargs = 0;
while (*script) {
nb = strspn(script, " \t");
script += nb;
script += strspn(script, " \t");
if (*script) {
if (*script == '"') {
instring = 1;
script++;
if (*script == '\0')
break; /* Shouldn't return here. Need to NULL
* terminate below */
} else
instring = 0;
if (nargs >= maxargs - 1)
break;
*pvect++ = script;
nargs++;
script = findblank(script, instring, reduce);
script = findblank(script, reduce);
if (script == NULL)
return -1;
else if (*script == '#')

2
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, int);
extern char *findblank(char *, int);
extern int MakeArgs(char *, char **, int, int);

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

@ -267,7 +267,7 @@ GetLabel(char *line, const char *filename, int linenum)
{
char *wp;
if ((wp = findblank(line, 0, 1)) != NULL) {
if ((wp = findblank(line, 1)) != NULL) {
while (issep(*wp))
*wp++ = '\0';
if (*wp == '#')