summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/Makefile.lint1
-rw-r--r--usr/src/cmd/bc/bc.y83
-rw-r--r--usr/src/cmd/dc/dc.c72
-rw-r--r--usr/src/cmd/dc/dc.h49
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/chkperm.c61
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/creaserve.c32
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/delserve.c19
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/face.c79
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/listserv.c32
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/mnucheck.c24
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/modserv.c49
-rw-r--r--usr/src/cmd/face/src/filecab/fileb/termtest.c115
-rw-r--r--usr/src/cmd/face/src/xx/slash.c23
-rw-r--r--usr/src/cmd/face/src/xx/suspend.c18
-rw-r--r--usr/src/cmd/fdetach/fdetach.c27
-rw-r--r--usr/src/cmd/fmtmsg/main.c12
-rw-r--r--usr/src/cmd/graph/graph.c173
-rw-r--r--usr/src/cmd/spline/spline.c65
-rw-r--r--usr/src/cmd/tplot/banner.c19
-rw-r--r--usr/src/cmd/tplot/driver.c45
-rw-r--r--usr/src/cmd/tplot/vplot.c76
21 files changed, 577 insertions, 497 deletions
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
index df672c178a..44a648df7c 100644
--- a/usr/src/Makefile.lint
+++ b/usr/src/Makefile.lint
@@ -113,6 +113,7 @@ COMMON_SUBDIRS = \
cmd/emul64ioctl \
cmd/env \
cmd/expand \
+ cmd/fdetach \
cmd/fdformat \
cmd/fgrep \
cmd/file \
diff --git a/usr/src/cmd/bc/bc.y b/usr/src/cmd/bc/bc.y
index 5d51c15afe..669aed4a57 100644
--- a/usr/src/cmd/bc/bc.y
+++ b/usr/src/cmd/bc/bc.y
@@ -21,17 +21,16 @@
* CDDL HEADER END
*/
%}
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
+/* All Rights Reserved */
+
%{
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.9 */
+#pragma ident "%Z%%M% %I% %E% SMI"
%}
%{
#include <stdio.h>
@@ -41,9 +40,13 @@
#include <locale.h>
#include <signal.h>
-static int *getout(int);
+static void getout(int) __NORETURN;
static int *bundle(int, ...);
static void usage(void);
+
+int cpeek(char, int, char, int, char);
+void yyerror(char *);
+
%}
%union {
int *iptr;
@@ -103,9 +106,9 @@ start :
| start def dargs ')' '{' dlist slist '}'
= {
ttp = bundle(6, pre, $7, post, "0", numb[lev], "Q");
- conout(ttp, $2);
+ conout(ttp, (char *)$2);
rcrs = crs;
- output("");
+ output((int *)"");
lev = bindx = 0;
}
;
@@ -478,7 +481,8 @@ char *letr[26] = {
"u", "v", "w", "x", "y", "z"
};
-yylex()
+int
+yylex(void)
{
int c, ch;
@@ -674,8 +678,8 @@ gotit:
}
}
-cpeek(c1, yes1, c2, yes2, none)
-char c1, c2, none;
+int
+cpeek(char c1, int yes1, char c2, int yes2, char none)
{
int r;
@@ -690,7 +694,9 @@ char c1, c2, none;
return (r);
}
-getch()
+
+int
+getch(void)
{
int ch;
char mbuf[LINE_MAX];
@@ -751,21 +757,21 @@ bundle(int i, ...)
return (q);
}
-routput(p)
-int *p;
+void
+routput(int *p)
{
if (bdebug) printf("routput(%o)\n", p);
if (p >= &b_space[0] && p < &b_space[b_sp_max]) {
/* part of a bundle */
while (*p != 0)
- routput(*p++);
+ routput((int *)*p++);
}
else
printf((char *)p); /* character string */
}
-output(p)
-int *p;
+void
+output(int *p)
{
routput(p);
b_sp_nxt = & b_space[0];
@@ -775,9 +781,8 @@ int *p;
crs = rcrs;
}
-conout(p, s)
-int *p;
-char *s;
+void
+conout(int *p, char *s)
{
printf("[");
routput(p);
@@ -786,8 +791,8 @@ char *s;
lev--;
}
-yyerror(s)
-char *s;
+void
+yyerror(char *s)
{
if (ifile >= sargc)
ss = "teletype";
@@ -806,7 +811,8 @@ char *s;
b_sp_nxt = &b_space[0];
}
-checkbuffer()
+void
+checkbuffer(void)
{
/* Do not exceed the last char in input line buffer */
if (cp >= cpend) {
@@ -815,8 +821,8 @@ checkbuffer()
}
}
-pp(s)
-int *s;
+void
+pp(int *s)
{
/* puts the relevant stuff on pre and post for the letter s */
@@ -826,8 +832,8 @@ int *s;
post = yyval.iptr;
}
-tp(s)
-int *s;
+void
+tp(int *s)
{ /* same as pp, but for temps */
bundle(3, "0S", s, pre);
pre = yyval.iptr;
@@ -835,9 +841,8 @@ int *s;
post = yyval.iptr;
}
-yyinit(argc, argv)
-int argc;
-char *argv[];
+void
+yyinit(int argc, char **argv)
{
char mbuf[LINE_MAX];
@@ -860,9 +865,8 @@ char *argv[];
ss = sargv[0];
}
-static int *
-getout(code)
-int code;
+static void
+getout(int code)
{
printf("q");
(void) fflush(stdout);
@@ -870,22 +874,19 @@ int code;
}
int *
-getf(p)
-char *p;
+getf(char *p)
{
return ((int *) &funtab[2*(*p -0141)]);
}
int *
-geta(p)
-char *p;
+geta(char *p)
{
return ((int *) &atab[2*(*p - 0141)]);
}
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
int p[2];
int cflag = 0;
@@ -972,6 +973,8 @@ char *argv[];
#else
execl("/usr/bin/dc", "dc", "-", 0);
#endif
+
+ return (1);
}
static void
diff --git a/usr/src/cmd/dc/dc.c b/usr/src/cmd/dc/dc.c
index 8fbd4792ee..772201157c 100644
--- a/usr/src/cmd/dc/dc.c
+++ b/usr/src/cmd/dc/dc.c
@@ -19,15 +19,14 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-
/*
* Copyright 2003 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
+/* All Rights Reserved */
+
#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
@@ -38,6 +37,7 @@
#include <limits.h>
#include "dc.h"
#include <locale.h>
+#include <stdlib.h>
#define LASTFUN 026
long longest = 0, maxsize = 0, active = 0;
@@ -59,17 +59,17 @@ int lall = 0, lrel = 0, lcopy = 0, lmore = 0, lbytes = 0;
* may vary on less common architectures.
*/
-int
-ctoint(c)
#if __STDC__
-char c;
+int
+ctoint(char c)
#else
-unsigned char c;
+int
+ctoint(unsigned char c)
#endif
{
int i;
- if (c <= SCHAR_MAX)
+ if ((unsigned char)c <= SCHAR_MAX)
return ((int)c); /* Normal promotion will work */
for (i = 0; c++; i--); /* Scan for negative value */
return (i);
@@ -79,7 +79,9 @@ unsigned char c;
#define TEXT_DOMAIN "SYS_TEST" /* Use this only if it weren't. */
#endif
-void
+void commnds(void) __NORETURN;
+
+int
main(int argc, char **argv)
{
(void) setlocale(LC_ALL, "");
@@ -91,7 +93,7 @@ main(int argc, char **argv)
}
void
-commnds()
+commnds(void)
{
int c;
struct blk *p, *q;
@@ -772,7 +774,7 @@ execute:
}
struct blk *
-div(struct blk *ddivd, struct blk *ddivr)
+dcdiv(struct blk *ddivd, struct blk *ddivr)
{
int divsign, remsign, offset, divcarry;
int carry, dig, magic, d, dd, under;
@@ -931,7 +933,8 @@ ddone:
}
int
-dscale() {
+dscale(void)
+{
struct blk *dd, *dr, *r;
int c;
@@ -992,7 +995,7 @@ removr(struct blk *p, int n)
sputc(r, sgetc(p));
release(p);
if (n == 1) {
- s = div(r, tenptr);
+ s = dcdiv(r, tenptr);
release(r);
rewind(rem);
if (sfeof(rem) == 0)
@@ -1045,11 +1048,11 @@ sqrt(struct blk *p)
} else
salterc(r, c);
for (; ; ) {
- q = div(p, r);
+ q = dcdiv(p, r);
s = add(q, r);
release(q);
release(rem);
- q = div(s, sqtemp);
+ q = dcdiv(s, sqtemp);
release(s);
release(rem);
s = copy(r, length(r));
@@ -1089,7 +1092,7 @@ exp(struct blk *base, struct blk *ex)
chsign(e);
}
while (length(e) != 0) {
- e1 = div(e, sqtemp);
+ e1 = dcdiv(e, sqtemp);
release(e);
e = e1;
n = length(rem);
@@ -1236,7 +1239,8 @@ pushp(struct blk *p)
}
struct blk *
-pop() {
+pop(void)
+{
if (stkptr == stack) {
stkerr = 1;
return (0);
@@ -1245,7 +1249,8 @@ pop() {
}
struct blk *
-readin() {
+readin(void)
+{
struct blk *p, *q;
int dp, dpct;
int c;
@@ -1426,7 +1431,8 @@ chsign(struct blk *p)
}
char
-readc() {
+readc(void)
+{
loop:
if ((readptr != &readstk[0]) && (*readptr != 0)) {
if (sfeof(*readptr) == 0)
@@ -1475,7 +1481,7 @@ binop(char c)
r = mult(arg1, arg2);
break;
case '/':
- r = div(arg1, arg2);
+ r = dcdiv(arg1, arg2);
break;
}
release(arg1);
@@ -1534,7 +1540,7 @@ print(struct blk *hptr)
dec = getdec(p, sc);
p = removc(p, sc);
while (length(p) != 0) {
- q = div(p, basptr);
+ q = dcdiv(p, basptr);
release(p);
p = q;
(*outdit)(rem, 0);
@@ -1594,7 +1600,7 @@ getdec(struct blk *p, int sc)
sputc(s, sgetc(t));
sputc(s, 0);
release(t);
- t = div(s, tenptr);
+ t = dcdiv(s, tenptr);
release(s);
release(rem);
return (t);
@@ -1791,7 +1797,7 @@ bigot(struct blk *p, int flg)
chsign(p);
}
while (length(p) != 0) {
- q = div(p, tenptr);
+ q = dcdiv(p, tenptr);
release(p);
p = q;
rewind(rem);
@@ -1874,7 +1880,7 @@ add(struct blk *a1, struct blk *a2)
}
int
-eqk() {
+eqk(void) {
struct blk *p, *q;
int skp, skq;
@@ -1916,7 +1922,7 @@ removc(struct blk *p, int n)
while (sfeof(p) == 0)
sputc(q, sgetc(p));
if (n == 1) {
- r = div(q, tenptr);
+ r = dcdiv(q, tenptr);
release(q);
release(rem);
q = r;
@@ -1945,7 +1951,7 @@ scale(struct blk *p, int n)
sputc(q, n);
s = exp(inbas, q);
release(q);
- q = div(t, s);
+ q = dcdiv(t, s);
release(t);
release(s);
release(rem);
@@ -1954,7 +1960,8 @@ scale(struct blk *p, int n)
}
int
-subt() {
+subt(void)
+{
arg1 = pop();
EMPTYS;
savk = sunputc(arg1);
@@ -1968,7 +1975,8 @@ subt() {
}
int
-command() {
+command(void)
+{
int c;
char line[100], *sl;
void (*savint)();
@@ -2043,7 +2051,8 @@ cond(char c)
}
void
-load() {
+load(void)
+{
int c;
struct blk *p, *q, *t, *s;
@@ -2130,7 +2139,8 @@ salloc(int size)
}
struct blk *
-morehd() {
+morehd(void)
+{
struct blk *h, *kk;
char *dcmalloc();
diff --git a/usr/src/cmd/dc/dc.h b/usr/src/cmd/dc/dc.h
index 4268e8a7aa..5c23877680 100644
--- a/usr/src/cmd/dc/dc.h
+++ b/usr/src/cmd/dc/dc.h
@@ -19,11 +19,16 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.19 */
#define FATAL 0
#define NFATAL 1
#define BLK sizeof (struct blk)
@@ -81,10 +86,10 @@ struct wblk {
struct blk **lastw;
};
struct blk *hfree;
-struct blk *getwd();
-struct blk *lookwd();
-struct blk *getdec();
-struct blk *morehd();
+struct blk *getwd(struct blk *);
+struct blk *lookwd(struct blk *);
+struct blk *getdec(struct blk *, int);
+struct blk *morehd(void);
struct blk *arg1, *arg2;
int svargc;
@@ -106,19 +111,21 @@ struct blk *rem;
int k;
struct blk *irem;
int skd, skr;
-struct blk *pop(), *readin(), *add0(), *mult();
-struct blk *scalint();
-struct blk *removc();
-struct blk *add(), *div(), *removr();
-struct blk *exp();
-struct blk *sqrt();
-struct blk *salloc(), *copy();
-struct blk *scale();
-void commnds();
+struct blk *pop(void), *readin(void), *add0(struct blk *, int),
+ *mult(struct blk *, struct blk *);
+struct blk *scalint(struct blk *);
+struct blk *removc(struct blk *, int);
+struct blk *add(struct blk *, struct blk *),
+ *dcdiv(struct blk *, struct blk *), *removr(struct blk *, int);
+struct blk *exp(struct blk *, struct blk *);
+struct blk *sqrt(struct blk *);
+struct blk *salloc(int), *copy(struct blk *, int);
+struct blk *scale(struct blk *, int);
+void commnds(void);
void init(int, char **);
void pushp(struct blk *p);
void chsign(struct blk *p);
-char readc();
+char readc(void);
void unreadc(char);
void binop(char);
void print(struct blk *hptr);
@@ -129,7 +136,7 @@ void ospace(char *s);
void garbage(char *s);
void more(struct blk *hptr);
int cond(char c);
-void load();
+void load(void);
void sdump(char *s1, struct blk *hptr);
void salterwd(struct wblk *hptr, struct blk *n);
void redef(struct blk *p);
@@ -150,14 +157,12 @@ long all;
long headmor;
long obase;
int fw, fw1, ll;
-void (*outdit)();
-void bigot(), hexot();
+void (*outdit)(struct blk *, int);
+void bigot(struct blk *, int), hexot(struct blk *, int);
int logo;
int log10;
int count;
char *pp;
-void onintr();
-char *malloc();
-char *nalloc();
-char *realloc();
+void onintr(int);
+char *nalloc(char *, unsigned int);
char *dummy;
diff --git a/usr/src/cmd/face/src/filecab/fileb/chkperm.c b/usr/src/cmd/face/src/filecab/fileb/chkperm.c
index b1b0c26085..a7781ecd19 100644
--- a/usr/src/cmd/face/src/filecab/fileb/chkperm.c
+++ b/usr/src/cmd/face/src/filecab/fileb/chkperm.c
@@ -24,11 +24,10 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
/*
* chkperm.c
@@ -158,6 +157,7 @@
#include <pwd.h>
#include <unistd.h>
#include <fcntl.h>
+#include <stdlib.h>
#include "wish.h"
#ifdef DEBUG
@@ -209,22 +209,21 @@ struct cap_file_type {
char uname_in[L_cuserid];
int uflg, eflg, vflg, dflg;
-main(argc, argv)
-int argc;
-char **argv;
+char *get_uname(void);
+FILE *open_file(void);
+int list_user(void);
+int del_user(void);
+int get_value(int);
+int set_value(int, int);
+int cap_index(char *);
+
+int
+main(int argc, char **argv)
{
- register optchar;
- extern char *optarg;
+ int optchar;
char caparg[CAPLENGTH];
int lflg = 0, tflg = 0, yflg = 0, nflg = 0, opterr = 0;
- int list_user();
- int del_user();
- int get_value();
- int set_value();
- int cap_index();
- extern uid_t getuid();
- extern char *getenv();
uflg = 0;
eflg = 0;
@@ -346,14 +345,15 @@ char **argv;
fprintf (stderr,
"Usage: chkperm -l|-d|-v|-t cap|-e cap|-y cap|-n cap [-u user-name]\n"
);
+
+ return (FAIL);
}
int
-cap_index(capname)
-char *capname;
+cap_index(char *capname)
{
- register index;
+ int index;
for (index = 0; index < CAPS; index++)
if (strcmp(capname, caps[index].name) == 0)
@@ -365,17 +365,13 @@ char *capname;
int
-get_value(cap_index)
-int cap_index;
+get_value(int cap_index)
{
char *uname;
FILE *fp;
struct cap_file_type *iobuf;
int found, index;
- char *get_uname();
- FILE *open_file();
-
if (cap_index == FAIL)
return (FAIL);
@@ -430,8 +426,7 @@ int cap_index;
int
-set_value(cap_index, cap_value)
-int cap_index, cap_value;
+set_value(int cap_index, int cap_value)
{
char *uname;
FILE *fp;
@@ -439,9 +434,6 @@ int cap_index, cap_value;
int found, index;
long foff;
- char *get_uname();
- FILE *open_file();
-
if (cap_index == FAIL)
return (FAIL);
@@ -488,7 +480,7 @@ int cap_index, cap_value;
}
int
-del_user()
+del_user(void)
{
char *uname;
FILE *fp;
@@ -496,9 +488,6 @@ del_user()
int found, index;
long foff;
- char *get_uname();
- FILE *open_file();
-
if ((uname = get_uname()) == NULL)
return (FAIL);
@@ -537,14 +526,12 @@ del_user()
}
int
-list_user()
+list_user(void)
{
FILE *fp;
struct cap_file_type *iobuf;
int found = 0;
- FILE *open_file();
-
if ((fp = open_file()) == NULL)
return (FAIL);
@@ -564,11 +551,10 @@ list_user()
char *
-get_uname()
+get_uname(void)
{
char *user;
struct passwd *pw;
- extern uid_t getuid();
if (uflg)
return (uname_in);
@@ -591,13 +577,12 @@ get_uname()
FILE *
-open_file()
+open_file(void)
{
char fpath[BUFSIZ];
char *fpt;
FILE *fp;
int fd;
- char *getenv();
if ((fpt = getenv(fbase)) == NULL) {
fprintf(stderr, "$%s must be set in the environment.\n", fbase);
diff --git a/usr/src/cmd/face/src/filecab/fileb/creaserve.c b/usr/src/cmd/face/src/filecab/fileb/creaserve.c
index 3873e8a30b..653802ad3b 100644
--- a/usr/src/cmd/face/src/filecab/fileb/creaserve.c
+++ b/usr/src/cmd/face/src/filecab/fileb/creaserve.c
@@ -19,31 +19,33 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.9 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
#include "wish.h"
-main(argc,argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
FILE *fp, *tp;
- char *home, *getenv();
+ char *home;
char *prompt, *term, *mname, *appath, *dir, *penv, *npath;
char path[PATHSIZ], fpath[PATHSIZ], temp_name[PATHSIZ];
char io_buf[BUFSIZ], new_line[BUFSIZ];
- extern char *tempnam();
- extern pid_t getpid();
- extern uid_t getuid();
- extern gid_t getgid();
int exist, comp_len, written_yet, dos=0;
uid_t uid;
gid_t gid;
@@ -65,7 +67,7 @@ char *argv[];
dos = 1;
home=getenv(penv);
- sprintf(fpath, "%s/bin", home);
+ snprintf(fpath, sizeof (fpath), "%s/bin", home);
if ( (npath = tempnam(fpath,"ins.")) == NULL ) {
fprintf(stderr,"Cannot create install file\n");
exit(FAIL);
@@ -102,9 +104,9 @@ char *argv[];
/* Update the User's service file */
if (strcmp(penv, "HOME") == 0)
- sprintf(path, "%s/pref/services",home);
+ snprintf(path, sizeof (path), "%s/pref/services",home);
else
- sprintf(path, "%s/lib/services",home);
+ snprintf(path, sizeof (path), "%s/lib/services",home);
exist = access(path, 00) ? 0 : 1;
@@ -132,7 +134,9 @@ char *argv[];
rewind(fp);
rewind(tp);
- sprintf(new_line,"`echo 'name=\"%s\"';echo 'action=`run %s$%s%s`nop'`\n",mname,dos?"-n ":"",penv,&npath[strlen(home)]);
+ snprintf(new_line, sizeof (new_line),
+"`echo 'name=\"%s\"';echo 'action=`run %s$%s%s`nop'`\n",
+ mname, dos ? "-n " : "", penv, &npath[strlen(home)]);
comp_len = strcspn(new_line,";");
written_yet = 0;
@@ -154,5 +158,5 @@ char *argv[];
chmod(path, 0644);
chown(path, uid, gid);
unlink(temp_name);
- exit(SUCCESS);
+ return (SUCCESS);
}
diff --git a/usr/src/cmd/face/src/filecab/fileb/delserve.c b/usr/src/cmd/face/src/filecab/fileb/delserve.c
index cba89cce32..956c892ab0 100644
--- a/usr/src/cmd/face/src/filecab/fileb/delserve.c
+++ b/usr/src/cmd/face/src/filecab/fileb/delserve.c
@@ -20,15 +20,14 @@
* CDDL HEADER END
*/
/*
- * Copyright 1999 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <string.h>
@@ -37,9 +36,8 @@
#include <stdlib.h>
#include "wish.h"
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
FILE *fp, *nfp;
char *home, *penv, *fname;
@@ -59,11 +57,11 @@ char *argv[];
home = getenv(penv);
if (strcmp(penv, "HOME") == 0)
- sprintf(spath, "%s/pref/services", home);
+ snprintf(spath, sizeof (spath), "%s/pref/services", home);
else
- sprintf(spath, "%s/lib/services", home);
+ snprintf(spath, sizeof (spath), "%s/lib/services", home);
- sprintf(item, "`echo 'name=\"%s\"';", mname);
+ snprintf(item, sizeof (item), "`echo 'name=\"%s\"';", mname);
comp_len = strlen(item);
/* Update the service file */
@@ -97,7 +95,8 @@ char *argv[];
fname = strtok(NULL, "'");
fname = strtok(NULL, "$");
fname = strtok(NULL, "`");
- sprintf(hpath, "%s%s", home, &fname[strlen(penv)]);
+ snprintf(hpath, sizeof (hpath),
+ "%s%s", home, &fname[strlen(penv)]);
}
}
diff --git a/usr/src/cmd/face/src/filecab/fileb/face.c b/usr/src/cmd/face/src/filecab/fileb/face.c
index c7e7b20343..aafca79ce1 100644
--- a/usr/src/cmd/face/src/filecab/fileb/face.c
+++ b/usr/src/cmd/face/src/filecab/fileb/face.c
@@ -19,16 +19,23 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <pwd.h>
#include <string.h>
#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
#define NUMARGS 6
#define MAXARGS 25
@@ -42,22 +49,16 @@ static char vmsys[BUFSIZ];
static char home[BUFSIZ];
static char pidbuf[BUFSIZ];
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
char *Objlist[MAXARGS];
char fmlibuf[BUFSIZ];
char introbuf[BUFSIZ];
char aliasbuf[BUFSIZ];
char cmdbuf[BUFSIZ];
- register int i,j;
- extern pid_t getpid();
-/*
- int isatty();
-*/
- static void sanity_check();
- char *getenv();
+ int i,j;
+ static void sanity_check(void);
char *tmpenv;
char *newbuf;
char varbuf[BUFSIZ];
@@ -69,7 +70,7 @@ char *argv[];
exit(1);
}
else
- strcpy(vmsys, tmpenv);
+ strlcpy(vmsys, tmpenv, sizeof (vmsys));
if ( (tmpenv = getenv("OASYS")) == NULL ) {
fprintf(stderr, "\r\nThe environment variable \"OASYS\" must be set in\nyour environment before you can use FACE.\r\n\n");
@@ -91,9 +92,9 @@ char *argv[];
sanity_check();
- sprintf(introbuf, "%s%s", vmsys, "/bin/initial");
- sprintf(aliasbuf, "%s%s", vmsys, "/pathalias");
- sprintf(cmdbuf, "%s%s", vmsys, "/bin/cmdfile");
+ snprintf(introbuf, sizeof (introbuf), "%s%s", vmsys, "/bin/initial");
+ snprintf(aliasbuf, sizeof (aliasbuf), "%s%s", vmsys, "/pathalias");
+ snprintf(cmdbuf, sizeof (cmdbuf), "%s%s", vmsys, "/bin/cmdfile");
Objlist[0] = fmlibuf;
Objlist[1] = "-i";
Objlist[2] = introbuf;
@@ -107,7 +108,8 @@ char *argv[];
*/
char objbuf[BUFSIZ];
- sprintf(objbuf, "%s%s", vmsys, "/OBJECTS/Menu.face");
+ snprintf(objbuf, sizeof (objbuf),
+ "%s%s", vmsys, "/OBJECTS/Menu.face");
Objlist[NUMARGS + 1] = objbuf;
Objlist[NUMARGS + 2] = NULL;
}
@@ -124,7 +126,7 @@ char *argv[];
system("tput init; stty tab3");
*/
- sprintf(varbuf, "%s%s", home, "/pref/.variables");
+ snprintf(varbuf, sizeof (varbuf), "%s%s", home, "/pref/.variables");
fp = fopen(varbuf, "r");
while (fgets(buf, BUFSIZ, fp) != NULL) {
if (buf[strlen(buf) - 1] == '\n')
@@ -143,14 +145,14 @@ char *argv[];
execvp(fmlibuf, Objlist);
fprintf(stderr, "\r\nAn error has occurred while trying to use the \"AT&T FMLI\" package.\nThe file %s will not execute properly.\nThis situation must be corrected before you can proceed.\r\n\n",fmlibuf);
- exit(1);
+ return (1);
}
+static void error(char *);
char user[20];
-static
-void
-sanity_check()
+static void
+sanity_check(void)
{
char pref[BUFSIZ];
char environ[BUFSIZ];
@@ -161,25 +163,24 @@ sanity_check()
char wastebasket[BUFSIZ];
char wpref[BUFSIZ];
char cmd[BUFSIZ];
- char *getenv();
uid_t uid;
struct passwd *ppw;
uid = geteuid();
ppw = getpwuid(uid);
- strcpy(user, ppw->pw_name);
- strcpy(home, getenv("HOME"));
+ strlcpy(user, ppw->pw_name, sizeof (user));
+ strlcpy(home, getenv("HOME"), sizeof (home));
if (access(home, 07))
error(home);
- sprintf(pref, "%s/pref", home);
- sprintf(environ, "%s/.environ", pref);
- sprintf(variables, "%s/.variables", pref);
- sprintf(color, "%s/.colorpref", pref);
- sprintf(tmp, "%s/tmp", home);
- sprintf(bin, "%s/bin", home);
- sprintf(wastebasket, "%s/WASTEBASKET", home);
- sprintf(wpref, "%s/.pref", wastebasket);
+ snprintf(pref, sizeof (pref), "%s/pref", home);
+ snprintf(environ, sizeof (environ), "%s/.environ", pref);
+ snprintf(variables, sizeof (variables), "%s/.variables", pref);
+ snprintf(color, sizeof (color), "%s/.colorpref", pref);
+ snprintf(tmp, sizeof (tmp), "%s/tmp", home);
+ snprintf(bin, sizeof (bin), "%s/bin", home);
+ snprintf(wastebasket, sizeof (wastebasket), "%s/WASTEBASKET", home);
+ snprintf(wpref, sizeof (wpref), "%s/.pref", wastebasket);
if (access(pref, 00))
mkdir(pref, 0777);
@@ -187,19 +188,21 @@ sanity_check()
error(pref);
if (access(environ, 00)) {
- sprintf(cmd, "cp %s%s %s", vmsys, ENVIRON, environ);
+ snprintf(cmd, sizeof (cmd),
+ "cp %s%s %s", vmsys, ENVIRON, environ);
system(cmd);
} else if (access(environ, 06))
error(environ);
if (access(variables, 00)) {
- sprintf(cmd, "cp %s%s %s", vmsys, VARIABLES, variables);
+ snprintf(cmd, sizeof (cmd),
+ "cp %s%s %s", vmsys, VARIABLES, variables);
system(cmd);
} else if (access(variables, 06))
error(variables);
if (access(color, 00)) {
- sprintf(cmd, "cp %s%s %s", vmsys, COLOR, color);
+ snprintf(cmd, sizeof (cmd), "cp %s%s %s", vmsys, COLOR, color);
system(cmd);
} else if (access(color, 06))
error(color);
@@ -218,13 +221,13 @@ sanity_check()
mkdir(wastebasket, 0777);
if (access(wpref, 00)) {
- sprintf(cmd, "cp %s%s %s", vmsys, WPREF, wpref);
+ snprintf(cmd, sizeof (cmd), "cp %s%s %s", vmsys, WPREF, wpref);
system(cmd);
}
}
-error(object)
-char *object;
+static void
+error(char *object)
{
fprintf(stderr, "The permission of '%s' is not properly set for user '%s'.\n", object, user);
exit(1);
diff --git a/usr/src/cmd/face/src/filecab/fileb/listserv.c b/usr/src/cmd/face/src/filecab/fileb/listserv.c
index 95546bc2a4..4300d76011 100644
--- a/usr/src/cmd/face/src/filecab/fileb/listserv.c
+++ b/usr/src/cmd/face/src/filecab/fileb/listserv.c
@@ -19,22 +19,26 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "wish.h"
-main(argc,argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
FILE *fp;
- char *home, *getenv(), *label, *name, *penv, *fname;
+ char *home, *label, *name, *penv, *fname;
char tpath[PATHSIZ], hpath[PATHSIZ], buf[BUFSIZ], path[PATHSIZ], *opt;
int flag=0, cond=0, dos=0;
int app_type();
@@ -61,11 +65,11 @@ char *argv[];
home=getenv(penv);
if (strcmp(penv,"HOME") == 0) {
- sprintf(hpath, "%s/pref/services",home);
+ snprintf(hpath, sizeof (hpath), "%s/pref/services",home);
sprintf(tpath,"$VMSYS/OBJECTS/%s",dos?"dos":"programs");
}
else {
- sprintf(hpath, "%s/lib/services",home);
+ snprintf(hpath, sizeof (hpath), "%s/lib/services",home);
sprintf(tpath,"$OBJ_DIR");
}
@@ -82,7 +86,8 @@ char *argv[];
if (! strcmp(label,"name")) {
name=strtok(NULL,"\n");
- sprintf(path,"%s/bin/%s.ins",home,name);
+ snprintf(path, sizeof (path),
+ "%s/bin/%s.ins",home,name);
} else if (! strcmp(label,"`echo 'name")) {
name=strtok(NULL,"'");
fname=strtok(NULL,"=");
@@ -90,7 +95,8 @@ char *argv[];
if (! strncmp(fname,"OPEN",4))
continue;
fname=strtok(NULL,"`");
- sprintf(path,"%s%s",home,&fname[strlen(penv)]);
+ snprintf(path, sizeof (path),
+ "%s%s",home,&fname[strlen(penv)]);
} else
continue;
if ( access(path,00)==0 && app_type(path,dos) ) {
@@ -116,13 +122,11 @@ char *argv[];
printf("init=`message No Programs Installed`false\n");
exit(FAIL);
}
- exit(SUCCESS);
+ return (SUCCESS);
}
int
-app_type(path,dos)
-char *path;
-int dos;
+app_type(char *path, int dos)
{
FILE *fp;
char buf[BUFSIZ];
diff --git a/usr/src/cmd/face/src/filecab/fileb/mnucheck.c b/usr/src/cmd/face/src/filecab/fileb/mnucheck.c
index c28c18feef..c6e2ac6cfe 100644
--- a/usr/src/cmd/face/src/filecab/fileb/mnucheck.c
+++ b/usr/src/cmd/face/src/filecab/fileb/mnucheck.c
@@ -19,15 +19,21 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <string.h>
#include <ctype.h>
+#include <stdlib.h>
#include "wish.h"
@@ -36,18 +42,16 @@
#define INVALID 3
#define SUCCESS 0
-extern char *optarg;
char *string=NULL;
char *name=NULL;
-main(argc,argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
int ret;
int opt;
- char hpath[PATHSIZ], path[PATHSIZ], *home, *vmsys, *str, *getenv();
+ char hpath[PATHSIZ], path[PATHSIZ], *home, *vmsys, *str;
FILE *fp, *nfp;
home=getenv("HOME");
@@ -74,8 +78,8 @@ char *argv[];
if (strcmp(string,name) == 0)
return(SUCCESS);
- sprintf(hpath,"%s/pref/services",home);
- sprintf(path, "%s/lib/services",vmsys);
+ snprintf(hpath, sizeof (hpath), "%s/pref/services",home);
+ snprintf(path, sizeof (path), "%s/lib/services",vmsys);
if(access(hpath, 00) == 0) {
if ((fp=fopen(hpath, "r")) == NULL) {
@@ -105,8 +109,8 @@ char *argv[];
return(SUCCESS);
}
-mread(fp)
-FILE *fp;
+int
+mread(FILE *fp)
{
char buf[BUFSIZ], *label, *mname;
diff --git a/usr/src/cmd/face/src/filecab/fileb/modserv.c b/usr/src/cmd/face/src/filecab/fileb/modserv.c
index eb2d13fdf5..57a8273622 100644
--- a/usr/src/cmd/face/src/filecab/fileb/modserv.c
+++ b/usr/src/cmd/face/src/filecab/fileb/modserv.c
@@ -19,24 +19,28 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <stdlib.h>
#include "wish.h"
-main(argc,argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
FILE *fp;
- char *home, *getenv();
+ char *home;
char *term, *mname, *appath, *dir, *penv, *oterm, *oname, *oapath, *odir;
char hpath[PATHSIZ], path[PATHSIZ], command[BUFSIZ];
@@ -59,8 +63,8 @@ char *argv[];
home=getenv(penv);
if(strcmp(term,oterm) == 0 && strcmp(appath,oapath) == 0 && strcmp(dir,odir) == 0 ){
- sprintf(hpath, "%s/bin/%s.ins",home,mname);
- sprintf(path, "%s/bin/%s.ins",home,oname);
+ snprintf(hpath, sizeof (hpath), "%s/bin/%s.ins",home,mname);
+ snprintf(path, sizeof (path), "%s/bin/%s.ins",home,oname);
/* if file exist copy it to old.<name> */
if (strcmp(mname,oname) != 0) {
@@ -68,13 +72,14 @@ char *argv[];
copyfile(path,hpath);
chmod(hpath, 0755);
}
- sprintf(command, "$VMSYS/bin/delserve \"%s\" \"%s\"",oname,penv);
+ snprintf(command, sizeof (command),
+ "$VMSYS/bin/delserve \"%s\" \"%s\"",oname,penv);
system(command);
}
}
else {
- sprintf(hpath, "%s/bin/%s.ins",home,mname);
- sprintf(path, "%s/bin/old.%s.ins",home,mname);
+ snprintf(hpath, sizeof (hpath), "%s/bin/%s.ins",home,mname);
+ snprintf(path, sizeof (path), "%s/bin/old.%s.ins",home,mname);
/* if file exist copy it to old.<name> */
if (access(hpath, 00) == 0)
copyfile(hpath,path);
@@ -95,9 +100,10 @@ char *argv[];
/* Update the User's service file */
if(strcmp(mname,oname) != 0) {
if (strcmp(penv, "HOME") == 0)
- sprintf(path, "%s/pref/services",home);
+ snprintf(path, sizeof (path), "%s/pref/services",home);
else
- sprintf(path, "%s/OBJECTS/Menu.programs",home);
+ snprintf(path, sizeof (path),
+ "%s/OBJECTS/Menu.programs",home);
if ((fp=fopen(path,"a")) == NULL) {
fprintf(stderr, "Cannot open file");
@@ -111,6 +117,8 @@ char *argv[];
fprintf(fp,"action=`run $VMSYS/bin/%s.ins`\n",mname);
fclose(fp);
}
+
+ return (0);
}
@@ -120,13 +128,11 @@ char *argv[];
* copy a file
*/
FILE *
-cpfile(from, to)
-char *from;
-char *to;
+cpfile(char *from, char *to)
{
- register int c;
- register FILE *src;
- register FILE *dst;
+ int c;
+ FILE *src;
+ FILE *dst;
if ((src = fopen(from, "r")) == NULL)
return NULL;
@@ -146,9 +152,8 @@ char *to;
return dst;
}
-copyfile(from, to)
-char *from;
-char *to;
+int
+copyfile(char *from, char *to)
{
FILE *fp;
diff --git a/usr/src/cmd/face/src/filecab/fileb/termtest.c b/usr/src/cmd/face/src/filecab/fileb/termtest.c
index 5b21cd07a8..0909d7f7d3 100644
--- a/usr/src/cmd/face/src/filecab/fileb/termtest.c
+++ b/usr/src/cmd/face/src/filecab/fileb/termtest.c
@@ -19,11 +19,15 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <string.h>
@@ -32,6 +36,8 @@
#include <termio.h>
#include <sys/types.h>
#include <sys/times.h>
+#include <stdlib.h>
+#include <errno.h>
#include "wish.h"
#define BREAK 0
@@ -46,7 +52,15 @@
#define ARGSIZ 128
#define MAXSEQ 256
-char *strnsave();
+char *get_response(char *);
+char *strnsave(char *, unsigned int);
+void proc_file(char *);
+void interpret(char *, bool, char [][]);
+void do_case(char *, bool, char [][]);
+void debug_out(bool, char *, char *);
+void output(char *);
+void initialize(void);
+
#define strsave(s) ((s) ? strnsave(s, strlen(s)) : NULL )
@@ -68,15 +82,13 @@ int Num_used;
/* general purpose interrupt catcher */
void
-intr(n)
-int n;
+intr(int n)
{
(void)signal(n, intr);
}
void
-cleanup(sig)
-int sig;
+cleanup(int sig)
{
if (sig)
(void)signal(sig, SIG_IGN);
@@ -84,14 +96,12 @@ int sig;
exit(sig);
}
-main(argc, argv)
-int argc;
-char *argv[];
+
+int
+main(int argc, char **argv)
{
int i;
struct termio tty;
- char *getenv();
- char *get_response();
if (argc > 1 && strcmp(argv[1], "-d") == 0)
Debug = TRUE;
@@ -118,14 +128,14 @@ char *argv[];
ioctl(0, TCSETAF, &Restore);
if (Retval)
fputs("Can't find identify file\n", stderr);
- exit(Retval);
+ return (Retval);
}
/*
* interprets an identify file
*/
-proc_file(dirname)
-char *dirname;
+void
+proc_file(char *dirname)
{
char path[512];
@@ -149,12 +159,11 @@ char *dirname;
* expands "$0" to expand string
*/
char *
-get_string(expand)
-char expand[10][ARGSIZ];
+get_string(char expand[10][ARGSIZ])
{
- register char *p;
- register char *s;
- register int c;
+ char *p;
+ char *s;
+ int c;
static char buf[BUFSIZ];
/* skip white space, comments */
@@ -177,7 +186,7 @@ char expand[10][ARGSIZ];
if (p = strchr(Woutbs, c))
c = Withbs[p - Woutbs];
else if (isdigit(c)) {
- register int ac;
+ int ac;
c -= '0';
if (isdigit(ac = getc(Fp))) {
@@ -216,10 +225,11 @@ char expand[10][ARGSIZ];
/*
* get string and tokenize it
*/
-get_token()
+int
+get_token(void)
{
- register char *s;
- register int i;
+ char *s;
+ int i;
s = get_string(NULL);
if (s[0] == '\0')
@@ -234,13 +244,10 @@ get_token()
* interpreter - executes 1 statement and returns
* expects a token to be preread into Tok
*/
-interpret(recv, skip, arg)
-char *recv;
-bool skip;
-char arg[10][ARGSIZ];
+void
+interpret(char *recv, bool skip, char arg[10][ARGSIZ])
{
- register char *s = NULL;
- char *get_response();
+ char *s = NULL;
switch (Tok) {
case QUERY:
@@ -297,15 +304,13 @@ char arg[10][ARGSIZ];
/* case statement */
/*ARGSUSED*/
-do_case(recv, skip, arg)
-char *recv;
-bool skip;
-char arg[10][ARGSIZ];
+void
+do_case(char *recv, bool skip, char arg[10][ARGSIZ])
{
- register char *s;
- register char *ex;
+ char *s;
+ char *ex;
int i;
- register bool fail;
+ bool fail;
char newarg[10][ARGSIZ];
fail = TRUE;
@@ -338,12 +343,10 @@ char arg[10][ARGSIZ];
}
/* print debugging info */
-debug_out(skip, s1, s2)
-bool skip;
-char *s1;
-char *s2;
+void
+debug_out(bool skip, char *s1, char *s2)
{
- register int i;
+ int i;
if (!Debug)
return;
@@ -355,15 +358,15 @@ char *s2;
if (s2) {
putchar(' ');
putchar('\'');
- output(s2, strlen(s2));
+ output(s2);
putchar('\'');
}
putchar('\n');
}
/* print a string "nicely" */
-output(s)
-register char *s;
+void
+output(char *s)
{
while (*s) {
if (isprint(*s))
@@ -386,8 +389,7 @@ register char *s;
/* query the terminal and return response */
char *
-get_response(s)
-char *s;
+get_response(char *s)
{
char *recv;
char recvbuf[512];
@@ -395,7 +397,6 @@ char *s;
int numread;
char *lookup();
char *enter();
- extern int errno;
if (s == NULL || *s == '\0') {
initialize();
@@ -429,10 +430,9 @@ char *s;
* to save sending/reading it again
*/
char *
-lookup(s)
-char *s;
+lookup(char *s)
{
- register int i;
+ int i;
for (i = 0; i < Num_used; i++)
if (!strcmp(s, SendRecv[i].send))
@@ -444,9 +444,7 @@ char *s;
* enter a send/response pair into the array of used sequences
*/
char *
-enter(s, r)
-char *s;
-char *r;
+enter(char *s, char *r)
{
struct SR dummy;
@@ -461,17 +459,16 @@ char *r;
* clear out the used sequences array, so we can try a second time
* to query the terminal
*/
-initialize()
+void
+initialize(void)
{
Num_used = 0;
}
char *
-strnsave(s, len)
-char s[];
-unsigned int len;
+strnsave(char s[], unsigned int len)
{
- register char *p;
+ char *p;
if ((p = malloc(len + 1)) == NULL)
return NULL;
diff --git a/usr/src/cmd/face/src/xx/slash.c b/usr/src/cmd/face/src/xx/slash.c
index 8fe1c02320..ae18f239f6 100644
--- a/usr/src/cmd/face/src/xx/slash.c
+++ b/usr/src/cmd/face/src/xx/slash.c
@@ -19,23 +19,26 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1 */
-#include <stdio.h>
+#pragma ident "%Z%%M% %I% %E% SMI"
-extern char *optarg;
-extern int optind;
+#include <stdio.h>
+#include <stdlib.h>
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
- register int c, fromstr;
- register char *sptr;
- FILE *fp, *fopen();
+ int c, fromstr;
+ char *sptr;
+ FILE *fp;
char *ifile;
int errflag;
diff --git a/usr/src/cmd/face/src/xx/suspend.c b/usr/src/cmd/face/src/xx/suspend.c
index b2ef7ce429..dac86ebf47 100644
--- a/usr/src/cmd/face/src/xx/suspend.c
+++ b/usr/src/cmd/face/src/xx/suspend.c
@@ -19,21 +19,25 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.1 */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <signal.h>
+#include <stdlib.h>
#include "wish.h"
bool _Debug = FALSE;
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
{
if (getenv("DEBUG"))
_Debug = TRUE;
@@ -41,7 +45,7 @@ char *argv[];
signal(SIGINT, SIG_IGN);
signal(SIGQUIT, SIG_IGN);
if (suspend(argv[1]) == FAIL)
- exit(1);
+ return (1);
else
- exit(0);
+ return (0);
}
diff --git a/usr/src/cmd/fdetach/fdetach.c b/usr/src/cmd/fdetach/fdetach.c
index c1fd0756ac..c18138ea5b 100644
--- a/usr/src/cmd/fdetach/fdetach.c
+++ b/usr/src/cmd/fdetach/fdetach.c
@@ -19,30 +19,37 @@
*
* CDDL HEADER END
*/
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
-#ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <errno.h>
+#include <stdlib.h>
+#include <stropts.h>
+
/*
* Unmount a STREAM from the command line.
*/
-main(argc, argv)
- int argc;
- char **argv;
+/* ARGSUSED */
+int
+main(int argc, char **argv)
{
- if (argv[1] == NULL)
- {
- printf("usage: fdetach pathname\n");
+ if (argv[1] == NULL) {
+ (void) printf("usage: fdetach pathname\n");
exit(-1);
}
- if (fdetach(argv[1]) < 0)
- {
+ if (fdetach(argv[1]) < 0) {
perror("fdetach");
exit(-1);
}
- exit(0);
+ return (0);
}
diff --git a/usr/src/cmd/fmtmsg/main.c b/usr/src/cmd/fmtmsg/main.c
index 9a35f55d76..f7a00b12e1 100644
--- a/usr/src/cmd/fmtmsg/main.c
+++ b/usr/src/cmd/fmtmsg/main.c
@@ -19,15 +19,15 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
+/* All Rights Reserved */
+
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -495,9 +495,8 @@ getauxsevs(ptr)
* Open Issues:
*/
-main(argc, argv)
- int argc; /* Argument count */
- char *argv[]; /* Pointers to arguments */
+int
+main(int argc, char **argv)
{
/* Local automatic data */
@@ -824,6 +823,5 @@ main(argc, argv)
if (msgrtn & MM_NOCON) exitval += 4;
}
- exit(exitval);
return(exitval);
}
diff --git a/usr/src/cmd/graph/graph.c b/usr/src/cmd/graph/graph.c
index 1ff4ab9328..c2b62dd4bb 100644
--- a/usr/src/cmd/graph/graph.c
+++ b/usr/src/cmd/graph/graph.c
@@ -19,20 +19,22 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 1992, 2000 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <ctype.h>
#include <math.h>
+#include <stdlib.h>
+
#define INF 1.e+37
#define F .25
@@ -55,7 +57,7 @@ struct val {
int lblptr;
} *xx;
-static char *labs;
+static char *labsarr;
static int labsiz;
int tick = 50;
@@ -72,7 +74,6 @@ int brkf;
float dx;
char *plotsymb;
-double atof();
#define BSIZ 80
char labbuf[BSIZ];
char titlebuf[BSIZ];
@@ -86,17 +87,29 @@ char *modes[] = {
"longdashed"
};
int mode = 1;
-char *realloc();
-char *malloc();
-double ident(x)
-double x;
+void init(struct xy *);
+void setopt(int, char **);
+void readin(void);
+void transpose(void);
+void scale(struct xy *, struct val *);
+void axes(void);
+void title(void);
+void badarg(void);
+void limread(struct xy *, int *, char ***);
+void domark(float, struct xy *);
+void plot(void);
+int submark(float, struct xy *, int);
+int con_v(float, struct xy *, int *);
+
+double
+ident(double x)
{
return(x);
}
-main(argc,argv)
-char *argv[];
+int
+main(int argc, char **argv)
{
space(0,0,4096,4096);
@@ -104,8 +117,8 @@ char *argv[];
init(&yd);
xd.xsize = yd.xsize = 1.;
xx = (struct val *)malloc((unsigned)sizeof(struct val));
- labs = malloc(1);
- labs[labsiz++] = 0;
+ labsarr = malloc(1);
+ labsarr[labsiz++] = 0;
setopt(argc,argv);
if(erasf)
erase();
@@ -121,15 +134,15 @@ char *argv[];
return(0);
}
-init(p)
-struct xy *p;
+void
+init(struct xy *p)
{
p->xf = ident;
p->xmult = 1;
}
-setopt(argc,argv)
-char *argv[];
+void
+setopt(int argc, char **argv)
{
char *p1, *p2;
float temp;
@@ -227,10 +240,8 @@ again: switch(argv[0][0]) {
}
}
-limread(p, argcp, argvp)
-register struct xy *p;
-int *argcp;
-char ***argvp;
+void
+limread(struct xy *p, int *argcp, char ***argvp)
{
if(*argcp>1 && (*argvp)[1][0]=='l') {
(*argcp)--;
@@ -248,12 +259,10 @@ char ***argvp;
p->xqf = 1;
}
-numb(np, argcp, argvp)
-int *argcp;
-float *np;
-register char ***argvp;
+int
+numb(float *np, int *argcp, char ***argvp)
{
- register char c;
+ char c;
if(*argcp <= 1)
return(0);
@@ -267,9 +276,10 @@ register char ***argvp;
return(1);
}
-readin()
+void
+readin(void)
{
- register t;
+ int t;
struct val *temp;
if(absf==1) {
@@ -301,9 +311,10 @@ readin()
}
}
-transpose()
+void
+transpose(void)
{
- register i;
+ int i;
float f;
struct xy t;
if(!transf)
@@ -314,25 +325,25 @@ transpose()
}
}
-copystring(k)
+int
+copystring(int k)
{
- register char *temp;
- register i;
+ char *temp;
+ int i;
int q;
- temp = realloc(labs,(unsigned)(labsiz+1+k));
+ temp = realloc(labsarr,(unsigned)(labsiz+1+k));
if(temp==0)
return(0);
- labs = temp;
+ labsarr = temp;
q = labsiz;
for(i=0;i<=k;i++)
- labs[labsiz++] = labbuf[i];
+ labsarr[labsiz++] = labbuf[i];
return(q);
}
float
-modceil(f,t)
-float f,t;
+modceil(float f, float t)
{
t = fabs(t);
@@ -340,18 +351,16 @@ float f,t;
}
float
-modfloor(f,t)
-float f,t;
+modfloor(float f, float t)
{
t = fabs(t);
return(floor(f/t)*t);
}
-getlim(p,v)
-register struct xy *p;
-struct val *v;
+void
+getlim(struct xy *p, struct val *v)
{
- register i;
+ int i;
i = 0;
do {
@@ -365,10 +374,10 @@ struct val *v;
struct z {
float lb,ub,mult,quant;
-} setloglim(), setlinlim();
+} setloglim(int, int, float, float), setlinlim(int, int, float, float);
-setlim(p)
-register struct xy *p;
+void
+setlim(struct xy *p)
{
float t,delta,sign;
struct z z;
@@ -435,8 +444,7 @@ register struct xy *p;
}
struct z
-setloglim(lbf,ubf,lb,ub)
-float lb,ub;
+setloglim(int lbf, int ubf, float lb, float ub)
{
float r,s,t;
struct z z;
@@ -468,9 +476,7 @@ float lb,ub;
}
struct z
-setlinlim(lbf,ubf,xlb,xub)
-int lbf,ubf;
-float xlb,xub;
+setlinlim(int lbf, int ubf, float xlb, float xub)
{
struct z z;
float r,s,delta;
@@ -510,9 +516,8 @@ loop:
return(z);
}
-scale(p,v)
-register struct xy *p;
-struct val *v;
+void
+scale(struct xy *p, struct val *v)
{
float edge;
@@ -525,9 +530,10 @@ struct val *v;
p->xb = p->xbot - (*p->xf)(p->xlb)*p->xa + .5;
}
-axes()
+void
+axes(void)
{
- register i;
+ int i;
if(gridf==0)
return;
@@ -540,9 +546,9 @@ axes()
(void) setmark(&yd, 1);
}
-setmark(p, doprt)
-register struct xy *p;
-int doprt; /* 1 == print ticks, 0 == just count */
+/* doprnt: 1 == print ticks, 0 == just count */
+int
+setmark(struct xy *p, int doprt)
{
int xn = 0;
float x,xl,xu;
@@ -574,10 +580,8 @@ int doprt; /* 1 == print ticks, 0 == just count */
return(xn);
}
-submark(x,p,doprt)
-float x;
-struct xy *p;
-int doprt;
+int
+submark(float x, struct xy *p, int doprt)
{
if(1.001*p->xlb < x && .999*p->xub > x) {
if (doprt)
@@ -589,9 +593,8 @@ int doprt;
}
}
-domark(markf, p)
-float markf;
-register struct xy *p;
+void
+domark(float markf, struct xy *p)
{
int mark = markf;
@@ -613,7 +616,8 @@ register struct xy *p;
}
}
-plot()
+void
+plot(void)
{
int ix,iy;
int i;
@@ -640,10 +644,8 @@ plot()
linemod(modes[1]);
}
-con_v(xv,p,ip)
-float xv;
-register struct xy *p;
-int *ip;
+int
+con_v(float xv, struct xy *p, int *ip)
{
long ix;
ix = p->xa*(*p->xf)(xv*p->xmult) + p->xb;
@@ -653,18 +655,19 @@ int *ip;
return(1);
}
-getfloat(p)
-float *p;
+int
+getfloat(float *p)
{
- register i;
+ int i;
i = scanf("%f",p);
return(i==1);
}
-getstring()
+int
+getstring(void)
{
- register i;
+ int i;
char junk[20];
i = scanf("%1s",labbuf);
if(i==-1)
@@ -688,11 +691,11 @@ getstring()
}
if(i==-1)
return(-1);
- return(strlen(labbuf));
+ return((int)strlen(labbuf));
}
-
-symbol(ix,iy,k)
+int
+symbol(int ix, int iy, int k)
{
if(symbf==0&&k<0) {
@@ -702,13 +705,14 @@ symbol(ix,iy,k)
}
else {
move(ix,iy);
- label(k>=0?labs+k:plotsymb);
+ label(k>=0?labsarr+k:plotsymb);
move(ix,iy);
return(!brkf|k<0);
}
}
-title()
+void
+title(void)
{
char *buf, *bufp;
@@ -736,7 +740,8 @@ title()
free(buf);
}
-badarg()
+void
+badarg(void)
{
fprintf(stderr,"graph: error in arguments\n");
exit(1);
diff --git a/usr/src/cmd/spline/spline.c b/usr/src/cmd/spline/spline.c
index 8fe5095ab0..43e949f82a 100644
--- a/usr/src/cmd/spline/spline.c
+++ b/usr/src/cmd/spline/spline.c
@@ -22,13 +22,16 @@
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+/*
+ * Copyright 1988 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
-/* Portions Copyright (c) 1988, Sun Microsystems, Inc. */
-/* All Rights Reserved. */
+#pragma ident "%Z%%M% %I% %E% SMI"
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */
#include <stdio.h>
#include <math.h>
+#include <stdlib.h>
#define NP 1000
#define INF HUGE
@@ -169,7 +172,8 @@ where
*/
REAL
-rhs(i){
+rhs(int i)
+{
int i_;
double zz;
i_ = i==n-1?0:i;
@@ -177,7 +181,9 @@ rhs(i){
return(6*((y.val[i_+1]-y.val[i_])/(x.val[i+1]-x.val[i]) - zz));
}
-spline(){
+int
+spline(void)
+{
REAL d,s,u,v,hi,hi1;
REAL h;
REAL D2yi,D2yi1,D2yn1,x0,x1,yy,a;
@@ -243,19 +249,23 @@ spline(){
}
}
return(1);
- }
-readin() {
+}
+
+void
+readin(void) {
for(n=0;n<NP;n++){
if(auta) x.val[n] = n*dx+x.lb;
else if(!getfloat(&x.val[n])) break;
- if(!getfloat(&y.val[n])) break; } }
+ if(!getfloat(&y.val[n])) break; }
+}
-getfloat(p)
- REAL *p;{
+int
+getfloat(REAL *p)
+{
char buf[30];
- register c;
+ int c;
int i;
- extern double atof();
+
for(;;){
c = getchar();
if (c==EOF) {
@@ -287,20 +297,21 @@ getfloat(p)
break; }
buf[i] = ' ';
*p = atof(buf);
- return(1); }
+ return(1);
+}
-getlim(p)
- struct proj *p; {
+void
+getlim(struct proj *p)
+{
int i;
for(i=0;i<n;i++) {
if(!p->lbf && p->lb>(p->val[i])) p->lb = p->val[i];
if(!p->ubf && p->ub<(p->val[i])) p->ub = p->val[i]; }
- }
-
+}
-main(argc,argv)
- char *argv[];{
- extern char *malloc();
+int
+main(int argc, char **argv)
+{
int i;
x.lbf = x.ubf = y.lbf = y.ubf = 0;
x.lb = INF;
@@ -347,13 +358,12 @@ again: switch(argv[0][0]) {
if(r==NULL||!spline()) for(i=0;i<n;i++){
printf("%f ",x.val[i]);
printf("%f\n",y.val[i]); }
- exit(0);
+ return (0);
}
-numb(np,argcp,argvp)
- int *argcp;
- REAL *np;
- char ***argvp;{
- double atof();
+
+int
+numb(REAL *np, int *argcp, char ***argvp)
+{
char c;
if(*argcp<=1) return(0);
c = (*argvp)[1][0];
@@ -361,5 +371,6 @@ numb(np,argcp,argvp)
*np = atof((*argvp)[1]);
(*argcp)--;
(*argvp)++;
- return(1); }
+ return(1);
+}
diff --git a/usr/src/cmd/tplot/banner.c b/usr/src/cmd/tplot/banner.c
index a6a175356a..e14f5f2c7c 100644
--- a/usr/src/cmd/tplot/banner.c
+++ b/usr/src/cmd/tplot/banner.c
@@ -19,13 +19,21 @@
*
* CDDL HEADER END
*/
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
-#ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <sys/types.h>
+#include <time.h>
+
#define FF '\014'
unsigned char chrtab[][16] = {
0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000, /*, sp, */
@@ -126,14 +134,11 @@ unsigned char chrtab[][16] = {
0000,0176,0176,0176,0176,0176,0176,0176,0176,0176,0176,0000,0000,0000,0000,0000, /*, del, */
};
-banner(out,s)
-FILE *out;
-char *s;
+void
+banner(FILE *out, char *s)
{
- extern char *ctime();
- extern time_t time();
long timeb;
- register char *sp;
+ char *sp;
int i, j, t, lsw;
for(lsw=0; s[lsw] && lsw<5; lsw++);
diff --git a/usr/src/cmd/tplot/driver.c b/usr/src/cmd/tplot/driver.c
index 20ef7b464f..b7964f6279 100644
--- a/usr/src/cmd/tplot/driver.c
+++ b/usr/src/cmd/tplot/driver.c
@@ -19,11 +19,17 @@
*
* CDDL HEADER END
*/
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
-#ident "%Z%%M% %I% %E% SMI"
#include <stdio.h>
#include <math.h>
#include <errno.h>
@@ -31,7 +37,13 @@
float deltx = 4095.0;
float delty = 4095.0;
-main(argc,argv) char **argv; {
+static void fplt(FILE *);
+static int getsi(FILE *);
+static void getsd(char *, FILE *);
+
+int
+main(int argc, char **argv)
+{
int std=1;
FILE *fin;
@@ -58,11 +70,13 @@ main(argc,argv) char **argv; {
}
if (std)
fplt( stdin );
- exit(0);
- }
+ return (0);
+}
-fplt(fin) FILE *fin; {
+static void
+fplt(FILE *fin)
+{
int c;
char s[256];
int xi,yi,x0,y0,x1,y1,r,dx,n,i;
@@ -137,8 +151,12 @@ fplt(fin) FILE *fin; {
}
}
closepl();
- }
-getsi(fin) FILE *fin; { /* get an integer stored in 2 ascii bytes. */
+}
+
+static int
+getsi(FILE *fin)
+{
+ /* get an integer stored in 2 ascii bytes. */
short a, b;
if((b = getc(fin)) == EOF)
return(EOF);
@@ -147,17 +165,18 @@ getsi(fin) FILE *fin; { /* get an integer stored in 2 ascii bytes. */
a = a<<8;
return(a|b);
}
-getsd(s,fin) char *s; FILE *fin; {
+
+static void
+getsd(char *s, FILE *fin)
+{
for( ; *s = getc(fin); s++)
if(*s == '\n')
break;
*s = '\0';
- return;
}
-
-matherr(x)
-struct exception *x;
+int
+matherr(struct exception *x)
{
if(x->type==DOMAIN)
{errno=EDOM;
@@ -172,5 +191,3 @@ else if ((x->type)==SING)
}
else return(0);
}
-
-
diff --git a/usr/src/cmd/tplot/vplot.c b/usr/src/cmd/tplot/vplot.c
index a5ad860375..c5d5b66a71 100644
--- a/usr/src/cmd/tplot/vplot.c
+++ b/usr/src/cmd/tplot/vplot.c
@@ -37,6 +37,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <sgtty.h>
+#include <stdlib.h>
#define NB 88
#define BSIZ 512
@@ -89,16 +90,20 @@ int in, out;
char picname[] = "/var/tmp/rasterXXXXXX";
char *picture;
-main(argc, argv)
-char **argv;
+void getpict(void);
+void plotch(int);
+void putpict(void);
+void line(int, int, int, int);
+void point(int, int);
+void getblk(int);
+void onintr(void);
+
+int
+main(int argc, char **argv)
{
- extern void onintr();
- register i;
- extern char *optarg;
- extern int optind;
- register int c;
+ int i;
+ int c;
char *fname;
- char *mktemp();
while ((c = getopt(argc, argv, "e:b:")) != EOF)
switch (c) {
@@ -131,11 +136,11 @@ char **argv;
"vplot: cannot open %s\n", argv[optind]);
exit(1);
}
- signal(SIGTERM, onintr);
+ signal(SIGTERM, (void (*)(int))onintr);
if (signal(SIGINT, SIG_IGN) != SIG_IGN)
- signal(SIGINT, onintr);
+ signal(SIGINT, (void (*)(int))onintr);
if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
- signal(SIGHUP, onintr);
+ signal(SIGHUP, (void (*)(int))onintr);
another:
for (i = 0; i < NB; i++) {
bufs[i].bno = -1;
@@ -176,12 +181,13 @@ another:
goto another;
}
unlink(picture);
- exit(0);
+ return (0);
}
-getpict()
+void
+getpict(void)
{
- register x1, y1;
+ int x1, y1;
again = 0;
for (;;)
@@ -293,11 +299,11 @@ getpict()
}
}
-plotch(c)
-register c;
+void
+plotch(int c)
{
- register j;
- register char *cp;
+ int j;
+ char *cp;
int i;
if (c < ' ' || c > 0177)
@@ -317,10 +323,12 @@ register c;
}
int f; /* versatec file number */
-putpict()
+
+void
+putpict(void)
{
- register x;
- register short *ip, *op;
+ int x;
+ short *ip, *op;
int y;
if (f == 0) {
@@ -360,12 +368,12 @@ putpict()
}
}
-line(x0, y0, x1, y1)
-register x0, y0;
+void
+line(int x0, int y0, int x1, int y1)
{
int dx, dy;
int xinc, yinc;
- register res1;
+ int res1;
int res2;
int slope;
@@ -418,10 +426,10 @@ register x0, y0;
point(x1, y1);
}
-point(x, y)
-register x, y;
+void
+point(int x, int y)
{
- register bno;
+ int bno;
bno = ((x&03700)>>6) + ((y&03700)>>1);
if (bno != bufs[0].bno) {
@@ -432,11 +440,11 @@ register x, y;
bufs[0].block[((y&077)<<3)+((x>>3)&07)] |= 1 << (7-(x&07));
}
-getblk(b)
-register b;
+void
+getblk(int b)
{
- register struct buf *bp1, *bp2;
- register char *tp;
+ struct buf *bp1, *bp2;
+ char *tp;
loop:
for (bp1 = bufs; bp1 < &bufs[NB]; bp1++) {
@@ -460,13 +468,15 @@ loop:
}
void
-onintr()
+onintr(void)
{
unlink(picture);
exit(1);
}
-zseek(a, b)
+
+int
+zseek(int a, int b)
{
return (lseek(a, (long)b*512, 0));
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-12 23:30:14 +0000