Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace home-grown parser with fparseln()

Browse Source
This commit is contained in:
lukem 2001-09-10 03:22:24 +00:00
parent 080d73b4a3
commit 617a65b6f7
3 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/mtree/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 1999/12/07 18:42:06 wennmach Exp $
# $NetBSD: Makefile,v 1.16 2001/09/10 03:22:24 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/27/95
PROG= mtree
@ -7,6 +7,9 @@ MAN= mtree.8
SRCS= compare.c crc.c create.c misc.c mtree.c spec.c verify.c \
stat_flags.c
LDADD+= -lutil
DPADD+= ${LIBUTIL}
CPPFLAGS+= -I${.CURDIR}/../../bin/ls
.PATH: ${.CURDIR}/../../usr.bin/cksum ${.CURDIR}/../../bin/ls

6
usr.sbin/mtree/misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: misc.c,v 1.10 2001/07/18 04:51:54 lukem Exp $ */
/* $NetBSD: misc.c,v 1.11 2001/09/10 03:22:24 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: misc.c,v 1.10 2001/07/18 04:51:54 lukem Exp $");
__RCSID("$NetBSD: misc.c,v 1.11 2001/09/10 03:22:24 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -50,7 +50,7 @@ __RCSID("$NetBSD: misc.c,v 1.10 2001/07/18 04:51:54 lukem Exp $");
#include "mtree.h"
#include "extern.h"
extern int lineno;
extern size_t lineno;
typedef struct _key {
const char *name; /* key name */

47
usr.sbin/mtree/spec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: spec.c,v 1.23 2001/07/18 04:51:54 lukem Exp $ */
/* $NetBSD: spec.c,v 1.24 2001/09/10 03:22:24 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: spec.c,v 1.23 2001/07/18 04:51:54 lukem Exp $");
__RCSID("$NetBSD: spec.c,v 1.24 2001/09/10 03:22:24 lukem Exp $");
#endif
#endif /* not lint */
@ -53,12 +53,13 @@ __RCSID("$NetBSD: spec.c,v 1.23 2001/07/18 04:51:54 lukem Exp $");
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <util.h>
#include <vis.h>
#include "mtree.h"
#include "extern.h"
int lineno; /* Current spec line number. */
size_t lineno; /* Current spec line number. */
static void set(char *, NODE *);
static void unset(char *, NODE *);
@ -69,47 +70,27 @@ spec(void)
NODE *centry, *last;
char *p;
NODE ginfo, *root;
int c_cur, c_next;
char buf[2048];
char *buf;
root = NULL;
centry = last = NULL;
memset(&ginfo, 0, sizeof(ginfo));
c_cur = c_next = 0;
for (lineno = 1; fgets(buf, sizeof(buf), stdin);
++lineno, c_cur = c_next, c_next = 0) {
/* Skip empty lines. */
if (buf[0] == '\n')
for (lineno = 0;
(buf = fparseln(stdin, NULL, &lineno, NULL,
FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT | FPARSELN_UNESCESC));
free(buf)) {
/* Skip leading whitespace. */
for (p = buf; *p && isspace((unsigned char)*p); ++p)
continue;
/* Find end of line. */
if ((p = strchr(buf, '\n')) == NULL)
mtree_err("line %d too long", lineno);
/* See if next line is continuation line. */
if (p[-1] == '\\') {
--p;
c_next = 1;
}
/* Null-terminate the line. */
*p = '\0';
/* Skip leading whitespace. */
for (p = buf; *p && isspace((unsigned char)*p); ++p);
/* If nothing but whitespace or comment char, continue. */
if (!*p || *p == '#')
/* If nothing but whitespace, continue. */
if (!*p)
continue;
#ifdef DEBUG
(void)fprintf(stderr, "line %d: {%s}\n", lineno, p);
#endif
if (c_cur) {
set(p, centry);
continue;
}
/* Grab file name, "$", "set", or "unset". */
if ((p = strtok(p, "\n\t ")) == NULL)
mtree_err("missing field");