rainse() -> raisestr(), per <arnej@fm.unit.no>
This commit is contained in:
deraadt
parent
e96e34d073
commit
4b24a3521e
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)config.h 5.14 (Berkeley) 7/1/91
|
||||
* $Id: config.h,v 1.14 1994/03/12 03:26:52 mycroft Exp $
|
||||
* $Id: config.h,v 1.15 1994/04/05 23:57:26 deraadt Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -178,7 +178,7 @@ char *qu();
|
||||
char *get_word();
|
||||
char *get_quoted_word();
|
||||
char *path();
|
||||
char *raise();
|
||||
char *raisestr();
|
||||
|
||||
int do_trace;
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)mkmakefile.c 5.33 (Berkeley) 7/1/91";*/
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.22 1994/03/10 22:09:51 mycroft Exp $";
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.23 1994/04/05 23:57:29 deraadt Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
@ -156,8 +156,8 @@ makefile()
|
||||
perror(path("Makefile"));
|
||||
exit(1);
|
||||
}
|
||||
fprintf(ofp, "KERN_IDENT=%s\n", raise(ident)); /* 29 Jun 92*/
|
||||
fprintf(ofp, "IDENT=-D%s", raise(ident));
|
||||
fprintf(ofp, "KERN_IDENT=%s\n", raisestr(ident)); /* 29 Jun 92*/
|
||||
fprintf(ofp, "IDENT=-D%s", raisestr(ident));
|
||||
if (profiling)
|
||||
fprintf(ofp, " -DGPROF");
|
||||
if (cputype == 0) {
|
||||
@ -245,7 +245,7 @@ read_files()
|
||||
machinearch);
|
||||
read_file(fname,1,0);
|
||||
}
|
||||
(void) sprintf(fname, "files.%s", raise(ident));
|
||||
(void) sprintf(fname, "files.%s", raisestr(ident));
|
||||
read_file(fname,0,1);
|
||||
(void) strcpy(fname, "../../../conf/options");
|
||||
read_file(fname,0,0);
|
||||
@ -256,7 +256,7 @@ read_files()
|
||||
machinearch);
|
||||
read_file(fname,0,0);
|
||||
}
|
||||
(void) sprintf(fname, "options.%s", raise(ident));
|
||||
(void) sprintf(fname, "options.%s", raisestr(ident));
|
||||
read_file(fname,0,1);
|
||||
}
|
||||
|
||||
@ -486,7 +486,7 @@ do_swapspec(f, name)
|
||||
}
|
||||
|
||||
char *
|
||||
raise(str)
|
||||
raisestr(str)
|
||||
register char *str;
|
||||
{
|
||||
register char *cp = str;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef lint
|
||||
static char rcsid[] = "$Id: specfile.c,v 1.8 1994/03/30 04:25:22 cgd Exp $";
|
||||
static char rcsid[] = "$Id: specfile.c,v 1.9 1994/04/05 23:57:31 deraadt Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stdio.h>
|
||||
@ -512,7 +512,7 @@ read_file(filename, fatal_on_open, override)
|
||||
dev.d_slave = 0;
|
||||
dev.d_flags++;
|
||||
for (op=opt; op; lop=op, op=op->op_next) {
|
||||
char *od = raise(ns(kf_name));
|
||||
char *od = raisestr(ns(kf_name));
|
||||
|
||||
/*
|
||||
* Found an option which matches the current device
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)config.h 5.14 (Berkeley) 7/1/91
|
||||
* $Id: config.h,v 1.14 1994/03/12 03:26:52 mycroft Exp $
|
||||
* $Id: config.h,v 1.15 1994/04/05 23:57:26 deraadt Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -178,7 +178,7 @@ char *qu();
|
||||
char *get_word();
|
||||
char *get_quoted_word();
|
||||
char *path();
|
||||
char *raise();
|
||||
char *raisestr();
|
||||
|
||||
int do_trace;
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)mkmakefile.c 5.33 (Berkeley) 7/1/91";*/
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.22 1994/03/10 22:09:51 mycroft Exp $";
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.23 1994/04/05 23:57:29 deraadt Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
@ -156,8 +156,8 @@ makefile()
|
||||
perror(path("Makefile"));
|
||||
exit(1);
|
||||
}
|
||||
fprintf(ofp, "KERN_IDENT=%s\n", raise(ident)); /* 29 Jun 92*/
|
||||
fprintf(ofp, "IDENT=-D%s", raise(ident));
|
||||
fprintf(ofp, "KERN_IDENT=%s\n", raisestr(ident)); /* 29 Jun 92*/
|
||||
fprintf(ofp, "IDENT=-D%s", raisestr(ident));
|
||||
if (profiling)
|
||||
fprintf(ofp, " -DGPROF");
|
||||
if (cputype == 0) {
|
||||
@ -245,7 +245,7 @@ read_files()
|
||||
machinearch);
|
||||
read_file(fname,1,0);
|
||||
}
|
||||
(void) sprintf(fname, "files.%s", raise(ident));
|
||||
(void) sprintf(fname, "files.%s", raisestr(ident));
|
||||
read_file(fname,0,1);
|
||||
(void) strcpy(fname, "../../../conf/options");
|
||||
read_file(fname,0,0);
|
||||
@ -256,7 +256,7 @@ read_files()
|
||||
machinearch);
|
||||
read_file(fname,0,0);
|
||||
}
|
||||
(void) sprintf(fname, "options.%s", raise(ident));
|
||||
(void) sprintf(fname, "options.%s", raisestr(ident));
|
||||
read_file(fname,0,1);
|
||||
}
|
||||
|
||||
@ -486,7 +486,7 @@ do_swapspec(f, name)
|
||||
}
|
||||
|
||||
char *
|
||||
raise(str)
|
||||
raisestr(str)
|
||||
register char *str;
|
||||
{
|
||||
register char *cp = str;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef lint
|
||||
static char rcsid[] = "$Id: specfile.c,v 1.8 1994/03/30 04:25:22 cgd Exp $";
|
||||
static char rcsid[] = "$Id: specfile.c,v 1.9 1994/04/05 23:57:31 deraadt Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stdio.h>
|
||||
@ -512,7 +512,7 @@ read_file(filename, fatal_on_open, override)
|
||||
dev.d_slave = 0;
|
||||
dev.d_flags++;
|
||||
for (op=opt; op; lop=op, op=op->op_next) {
|
||||
char *od = raise(ns(kf_name));
|
||||
char *od = raisestr(ns(kf_name));
|
||||
|
||||
/*
|
||||
* Found an option which matches the current device
|
||||
|
||||
Loading…
Reference in New Issue
Block a user