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

Make this compile again after the latest overhaul. 

Use -I${.CURDIR} instead of -I. to support placement of objects elsewhere.
Make sure arguments to ctype functions are unsigned char by changing the
type of one function argument.
Fix "local declaration shadows global" warnings by renaming variables.
Fix printing of size_t variable to use %zu format instead of %u.
This commit is contained in:
he 2005-04-21 11:21:58 +00:00
parent d5dac37f3b
commit 271cfff6d5
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/veriexecctl/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.5 2005/04/20 13:44:45 blymn Exp $
# $NetBSD: Makefile,v 1.6 2005/04/21 11:21:58 he Exp $
PROG= veriexecctl
MAN= veriexec.4 veriexecctl.8
SRCS= veriexecctl_parse.y veriexecctl_conf.l veriexecctl.c
YHEADER= 1
CPPFLAGS+= -I.
CPPFLAGS+= -I${.CURDIR}
DPADD+= ${LIBL}
LDADD+= -ll

44
sbin/veriexecctl/veriexecctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: veriexecctl.c,v 1.6 2005/04/20 13:44:45 blymn Exp $ */
/* $NetBSD: veriexecctl.c,v 1.7 2005/04/21 11:21:58 he Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad@bsd.org.il>
@ -53,25 +53,25 @@
extern struct veriexec_params params; /* in veriexecctl_parse.y */
extern char *filename; /* in veriexecctl_conf.l */
int fd, verbose = 0, no_mem = 0, phase;
int gfd, verbose = 0, no_mem = 0, phase;
unsigned line;
/*
* Prototypes
*/
int
fingerprint_load(char *infile);
int fingerprint_load(char*);
FILE *
openlock(const char *path)
{
int fd;
int lfd;
fd = open(path, O_RDONLY|O_EXLOCK, 0);
if (fd < 0)
lfd = open(path, O_RDONLY|O_EXLOCK, 0);
if (lfd < 0)
return (NULL);
return (fdopen(fd, "r"));
return (fdopen(lfd, "r"));
}
struct vexec_up *
@ -116,7 +116,7 @@ phase1_preload(void)
vup = CIRCLEQ_FIRST(&params_list);
if (ioctl(fd, VERIEXEC_TABLESIZE, &(vup->vu_param)) < 0) {
if (ioctl(gfd, VERIEXEC_TABLESIZE, &(vup->vu_param)) < 0) {
(void) fprintf(stderr, "Error in phase 1: Can't "
"set hash table size for device %d: %s.\n",
vup->vu_param.dev, strerror(errno));
@ -126,7 +126,7 @@ phase1_preload(void)
if (verbose) {
printf(" => Hash table sizing successful for device "
"%d. (%u entries)\n", vup->vu_param.dev,
"%d. (%zu entries)\n", vup->vu_param.dev,
vup->vu_param.hash_size);
}
@ -139,12 +139,12 @@ phase1_preload(void)
/*
* Load the fingerprint. Assumes that the fingerprint pseudo-device is
* opened and the file handle is in fd.
* opened and the file handle is in gfd.
*/
void
phase2_load(void)
{
if (ioctl(fd, VERIEXEC_LOAD, &params) < 0) {
if (ioctl(gfd, VERIEXEC_LOAD, &params) < 0) {
(void) fprintf(stderr, "%s: %s\n", params.file,
strerror(errno));
}
@ -155,12 +155,12 @@ phase2_load(void)
* Fingerprint load handling.
*/
int
fingerprint_load(char *infile)
fingerprint_load(char *ifile)
{
CIRCLEQ_INIT(&params_list);
if ((yyin = openlock(infile)) == NULL) {
err(1, "Failed to open %s", infile);
if ((yyin = openlock(ifile)) == NULL) {
err(1, "Failed to open %s", ifile);
}
/*
@ -172,7 +172,7 @@ fingerprint_load(char *infile)
if (verbose) {
(void) fprintf(stderr, "Phase 1: Building hash table information:\n");
(void) fprintf(stderr, "=> Parsing \"%s\"\n", infile);
(void) fprintf(stderr, "=> Parsing \"%s\"\n", ifile);
}
yyparse();
@ -191,7 +191,7 @@ fingerprint_load(char *infile)
if (verbose) {
(void) fprintf(stderr, "Phase 2: Loading per-file "
"fingerprints.\n");
(void) fprintf(stderr, "=> Parsing \"%s\"\n", infile);
(void) fprintf(stderr, "=> Parsing \"%s\"\n", ifile);
}
yyparse();
@ -227,8 +227,8 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
fd = open(VERIEXEC_DEVICE, O_RDWR, 0);
if (fd == -1) {
gfd = open(VERIEXEC_DEVICE, O_RDWR, 0);
if (gfd == -1) {
err(1, "Failed to open pseudo-device");
}
@ -246,7 +246,7 @@ main(int argc, char **argv)
exit(1);
}
if (ioctl(fd, VERIEXEC_FINGERPRINTS, &report) == 0) {
if (ioctl(gfd, VERIEXEC_FINGERPRINTS, &report) == 0) {
if (size != report.size) {
if (verbose)
fprintf(stderr, "fingerprints: "
@ -262,7 +262,7 @@ main(int argc, char **argv)
"realloc failed\n");
exit(1);
}
if (ioctl(fd, VERIEXEC_FINGERPRINTS,
if (ioctl(gfd, VERIEXEC_FINGERPRINTS,
&report) < 0) {
fprintf(stderr,
"fingerprints ioctl: %s\n",
@ -282,6 +282,6 @@ main(int argc, char **argv)
usage(1);
}
(void) close(fd);
(void) close(gfd);
return (0);
}

6
sbin/veriexecctl/veriexecctl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: veriexecctl.h,v 1.1 2005/04/21 00:27:35 blymn Exp $ */
/* $NetBSD: veriexecctl.h,v 1.2 2005/04/21 11:21:58 he Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad@bsd.org.il>
@ -39,7 +39,7 @@ struct vexec_up {
CIRCLEQ_ENTRY(vexec_up) vu_list;
};
extern int fd, no_mem, phase, verbose;
extern int gfd, no_mem, phase, verbose;
extern unsigned line;
extern char *infile;
extern FILE *yyin;
@ -53,6 +53,6 @@ struct vexec_up *dev_lookup(dev_t);
struct vexec_up *dev_add(dev_t);
int phase1_preload(void);
void phase2_load(void);
int convert(char *, u_char *);
int convert(u_char *, u_char *);
#endif /* _VEXECCTL_H_ */

4
sbin/veriexecctl/veriexecctl_parse.y
View File

@ -1,5 +1,5 @@
%{
/* $NetBSD: veriexecctl_parse.y,v 1.5 2005/04/20 13:44:45 blymn Exp $ */
/* $NetBSD: veriexecctl_parse.y,v 1.6 2005/04/21 11:21:58 he Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad@bsd.org.il>
@ -197,7 +197,7 @@ eol : EOL
* by "out". Returns the number of bytes converted or -1 if the conversion
* fails.
*/
int convert(char *fp, u_char *out) {
int convert(u_char *fp, u_char *out) {
int i, value, error, count;
count = strlen(fp);