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

Correct warning about unindented commands when the unindented command

Browse Source 
is actually a new label with a comment at the end of the line.
This commit is contained in:
Brian Somers 1999-12-23 21:43:00 +00:00
parent 7ce77f279b
commit 90e7fb01df
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55064
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,6 +262,33 @@ xgets(char *buf, int buflen, FILE *fp)
#define SYSTEM_VALIDATE 2
#define SYSTEM_EXEC 3
static char *
GetLabel(char *line, const char *filename, int linenum)
{
char *wp;
if ((wp = findblank(line, 0, 1)) != NULL) {
while (issep(*wp))
*wp++ = '\0';
if (*wp == '#')
*wp = '\0';
if (*wp != '\0') {
log_Printf(LogWARN, "Bad label in %s (line %d) - too many words.\n",
filename, linenum);
return NULL;
}
}
wp = strchr(line, ':');
if (wp == NULL || wp[1] != '\0') {
log_Printf(LogWARN, "Bad rule in %s (line %d) - missing colon.\n",
filename, linenum);
return NULL;
}
*wp = '\0';
return line;
}
/* Returns -2 for ``file not found'' and -1 for ``label not found'' */
static int
@ -269,7 +296,7 @@ ReadSystem(struct bundle *bundle, const char *name, const char *file,
struct prompt *prompt, struct datalink *cx, int how)
{
FILE *fp;
char *cp, *wp;
char *cp;
int n, len;
char line[LINE_LEN];
char filename[MAXPATHLEN];
@ -320,24 +347,8 @@ ReadSystem(struct bundle *bundle, const char *name, const char *file,
break;
default:
if ((wp = findblank(cp, 0, 1)) != NULL) {
while (issep(*wp))
*wp++ = '\0';
if (*wp == '#')
*wp = '\0';
if (*wp != '\0') {
log_Printf(LogWARN, "Bad label in %s (line %d) - too many words.\n",
filename, linenum);
continue;
}
}
wp = strchr(cp, ':');
if (wp == NULL || wp[1] != '\0') {
log_Printf(LogWARN, "Bad rule in %s (line %d) - missing colon.\n",
filename, linenum);
continue;
}
*wp = '\0';
if ((cp = GetLabel(cp, filename, linenum)) == NULL)
continue;
cp = strip(cp); /* lose any spaces between the label and the ':' */
if (strcmp(cp, name) == 0) {
@ -349,16 +360,12 @@ ReadSystem(struct bundle *bundle, const char *name, const char *file,
indent = issep(*line);
cp = strip(line);
if (*cp == '\0') /* empty / comment */
if (*cp == '\0') /* empty / comment */
continue;
if (!indent) { /* start of next section */
if (*cp != '!') {
wp = strchr(cp, ':');
if ((how == SYSTEM_EXEC) && (wp == NULL || wp[1] != '\0'))
log_Printf(LogWARN, "Unindented command (%s line %d) -"
" ignored\n", filename, linenum);
}
if (!indent) { /* start of next section */
if (*cp != '!' && how == SYSTEM_EXEC)
GetLabel(cp, filename, linenum);
break;
}