char *hostname;
#ifdef TILDENAME
-static char *tildename = Nullch;
-static char *tildedir = Nullch;
+static char *tildename = NULL;
+static char *tildedir = NULL;
#endif
-char *dointerp();
-char *getrealname();
+static char *getrealname(uid_t);
#ifdef CONDSUB
-char *skipinterp();
+static char *skipinterp(const char *, const char *);
#endif
-static void abort_interp();
+__dead static void abort_interp(void);
void
-intrp_init(tcbuf)
-char *tcbuf;
+intrp_init(char *tcbuf)
{
- char *getlogin();
-
/* get environmental stuff */
/* get home directory */
homedir = getenv("HOME");
- if (homedir == Nullch)
+ if (homedir == NULL)
homedir = getenv("LOGDIR");
dotdir = getval("DOTDIR",homedir);
/* get login name */
logname = getenv("USER");
- if (logname == Nullch)
+ if (logname == NULL)
logname = getenv("LOGNAME");
#ifdef GETLOGIN
- if (logname == Nullch)
+ if (logname == NULL)
logname = savestr(getlogin());
#endif
gethostname(buf,sizeof buf);
hostname = savestr(buf);
- if (index(hostname,'.'))
+ if (strchr(hostname,'.'))
hostname = savestr(hostname);
else {
char hname[128];
if (scorespec) /* that getwd below takes ~1/3 sec. */
return; /* and we do not need it for -s */
- (void) getwd(tcbuf); /* find working directory name */
+ (void) getcwd(tcbuf, sizeof(tcbuf));/* find working directory name */
origdir = savestr(tcbuf); /* and remember it */
}
/* Note that there is a 1-deep cache of ~name interpretation */
char *
-filexp(s)
-Reg1 char *s;
+filexp(const char *s)
{
static char filename[CBUFLEN];
char scrbuf[CBUFLEN];
- Reg2 char *d;
+ char *d;
#ifdef DEBUGGING
if (debug & DEB_FILEXP)
s = filename;
if (*s == '~') { /* does destination start with ~? */
if (!*(++s) || *s == '/') {
- Sprintf(scrbuf,"%s%s",homedir,s);
+ snprintf(scrbuf, sizeof(scrbuf), "%s%s",homedir,s);
/* swap $HOME for it */
#ifdef DEBUGGING
if (debug & DEB_FILEXP)
}
else {
#ifdef TILDENAME
- for (d=scrbuf; isalnum(*s); s++,d++)
+ for (d=scrbuf; isalnum((unsigned char)*s); s++,d++)
*d = *s;
*d = '\0';
if (tildedir && strEQ(tildename,scrbuf)) {
free(tildename);
free(tildedir);
}
- tildedir = Nullch;
+ tildedir = NULL;
tildename = savestr(scrbuf);
{
- struct passwd *getpwnam();
struct passwd *pwd = getpwnam(tildename);
- Sprintf(scrbuf,"%s%s",pwd->pw_dir,s);
+ snprintf(scrbuf, sizeof(scrbuf), "%s%s",pwd->pw_dir,s);
tildedir = savestr(pwd->pw_dir);
strcpy(filename,scrbuf);
endpwent();
strcpy(d,s+2);
else {
*d++ = '{';
- for (s++; isalnum(*s); s++) *d++ = *s;
+ for (s++; isalnum((unsigned char)*s); s++) *d++ = *s;
/* skip over token */
*d++ = '}';
strcpy(d,s);
#ifdef CONDSUB
/* skip interpolations */
-char *
-skipinterp(pattern,stoppers)
-Reg1 char *pattern;
-char *stoppers;
+static char *
+skipinterp(const char *pattern, const char *stoppers)
{
- while (*pattern && (!stoppers || !index(stoppers,*pattern))) {
+ while (*pattern && (!stoppers || !strchr(stoppers,*pattern))) {
#ifdef DEBUGGING
if (debug & 8)
printf("skipinterp till %s at %s\r\n",stoppers?stoppers:"",pattern);
}
}
getout:
- return pattern; /* where we left off */
+ return __UNCONST(pattern); /* where we left off */
}
#endif
/* interpret interpolations */
char *
-dointerp(dest,destsize,pattern,stoppers)
-Reg1 char *dest;
-Reg2 int destsize;
-Reg3 char *pattern;
-char *stoppers;
+dointerp(char *dest, size_t destsize, const char *pattern, const char *stoppers)
{
- Reg4 char *s;
- Reg5 int i;
+ char *s;
+ int i;
char scrbuf[512];
- bool upper = FALSE;
- bool lastcomp = FALSE;
+ bool upper = false;
+ bool lastcomp = false;
int metabit = 0;
- while (*pattern && (!stoppers || !index(stoppers,*pattern))) {
+ while (*pattern && (!stoppers || !strchr(stoppers,*pattern))) {
#ifdef DEBUGGING
if (debug & 8)
printf("dointerp till %s at %s\r\n",stoppers?stoppers:"",pattern);
#endif
if (*pattern == '%' && pattern[1]) {
- upper = FALSE;
- lastcomp = FALSE;
- for (s=Nullch; !s; ) {
+ upper = false;
+ lastcomp = false;
+ for (s=NULL; !s; ) {
switch (*++pattern) {
case '^':
- upper = TRUE;
+ upper = true;
break;
case '_':
- lastcomp = TRUE;
+ lastcomp = true;
break;
case '{':
pattern = cpytill(scrbuf,pattern+1,'}');
- if (s = index(scrbuf,'-'))
+ if ((s = strchr(scrbuf,'-')) != NULL)
*s++ = '\0';
else
s = nullstr;
matched = strEQ(scrbuf+1,dest);
}
else
- matched = instr(dest,scrbuf) != Nullch;
+ matched = instr(dest,scrbuf) != NULL;
if (matched==(rch == '=')) {
pattern = dointerp(dest,destsize,pattern+1,":)");
if (*pattern == ':')
#endif
#ifdef BACKTICK
case '`': {
- FILE *pipefp, *popen();
+ FILE *pipefp;
pattern = dointerp(scrbuf,(sizeof scrbuf),pattern+1,"`");
pipefp = popen(scrbuf,"r");
- if (pipefp != Nullfp) {
+ if (pipefp != NULL) {
int len;
len = fread(scrbuf,sizeof(char),(sizeof scrbuf)-1,
break;
case '$':
s = scrbuf;
- Sprintf(s,"%d",getpid());
+ snprintf(scrbuf, sizeof(scrbuf), "%d",getpid());
break;
case 'H': /* host name */
s = hostname;
char *t;
if (s != scrbuf) {
- Safecpy(scrbuf,s,(sizeof scrbuf));
+ safecpy(scrbuf,s,(sizeof scrbuf));
s = scrbuf;
}
- if (upper || !(t=rindex(s,'/')))
+ if (upper || !(t=strrchr(s,'/')))
t = s;
- while (*t && !isalpha(*t))
+ while (*t && !isalpha((unsigned char)*t)) {
t++;
- if (islower(*t))
- *t = toupper(*t);
+ *t = toupper((unsigned char)*t);
+ }
}
i = metabit; /* maybe get into register */
if (s == dest) {
destsize++;
}
else
- *dest++ = i & 037 | metabit;
+ *dest++ = (i & 037) | metabit;
pattern++;
}
else if (*pattern == '\\' && pattern[1]) {
i <<= 3;
i += *pattern++ - '0';
}
- *dest++ = i & 0377 | metabit;
+ *dest++ = (i & 0377) | metabit;
--pattern;
}
else if (i == 'b')
}
*dest = '\0';
getout:
- return pattern; /* where we left off */
+ return __UNCONST(pattern); /* where we left off */
}
void
-interp(dest,destsize,pattern)
-char *dest;
-int destsize;
-char *pattern;
+interp(char *dest, size_t destsize, const char *pattern)
{
- (void) dointerp(dest,destsize,pattern,Nullch);
+ (void) dointerp(dest,destsize,pattern,NULL);
#ifdef DEBUGGING
if (debug & DEB_FILEXP)
fputs(dest,stdout);
/* get the person's real name from /etc/passwd */
/* (string is overwritten, so it must be copied) */
-char *
-getrealname(uid)
-int uid;
+static char *
+getrealname(uid_t uid)
{
char *s, *c;
#ifdef BERKJUNK
while (*s && !isalnum(*s) && *s != '&') s++;
#endif
- if ((c = index(s, ',')) != Nullch)
+ if ((c = strchr(s, ',')) != NULL)
*c = '\0';
- if ((c = index(s, ';')) != Nullch)
+ if ((c = strchr(s, ';')) != NULL)
*c = '\0';
s = cpytill(buf,s,'&');
if (*s == '&') { /* whoever thought this one up was */
c = buf + strlen(buf); /* in the middle of the night */
strcat(c,logname); /* before the morning after */
strcat(c,s+1);
- if (islower(*c))
- *c = toupper(*c); /* gack and double gack */
+ if (islower((unsigned char)*c))
+ *c = toupper((unsigned char)*c); /* gack and double gack */
}
#else
- if ((c = index(s, '(')) != Nullch)
+ if ((c = strchr(s, '(')) != NULL)
*c = '\0';
- if ((c = index(s, '-')) != Nullch)
+ if ((c = strchr(s, '-')) != NULL)
s = c;
strcpy(buf,tmpbuf);
#endif
endpwent();
return buf; /* return something static */
#else
- if ((tmpfp=fopen(filexp(FULLNAMEFILE),"r")) != Nullfp) {
- Fgets(buf,sizeof buf,tmpfp);
- Fclose(tmpfp);
+ if ((tmpfp=fopen(filexp(FULLNAMEFILE),"r")) != NULL) {
+ fgets(buf,sizeof buf,tmpfp);
+ fclose(tmpfp);
}
else {
resetty();
printf("What is your name? ");
- Fgets(buf,(sizeof buf),stdin);
+ fgets(buf,(sizeof buf),stdin);
crmode();
raw();
noecho();
if (fork())
wait(0);
else {
- setuid(getuid());
+ setgid(getgid());
if ((tmpfp = fopen(filexp(FULLNAMEFILE),"w")) == NULL)
exit(1);
fprintf(tmpfp, "%s\n", buf);
- Fclose(tmpfp);
+ fclose(tmpfp);
exit(0);
}
}
}
static void
-abort_interp()
+abort_interp(void)
{
fputs("\r\n% interp buffer overflow!\r\n",stdout);
sig_catcher(0);
git.ckatri.com / bsdgames-darwin.git / blobdiff