sys_errlist -> strerror

SCCS-vsn: usr.bin/rdist/defs.h 5.7
SCCS-vsn: usr.bin/rdist/docmd.c 5.5
SCCS-vsn: usr.bin/rdist/expand.c 5.5
SCCS-vsn: usr.bin/rdist/server.c 5.11

diff --git a/usr/src/usr.bin/rdist/defs.h b/usr/src/usr.bin/rdist/defs.h
index d4a75a5..60b729e 100644 (file)
--- a/usr/src/usr.bin/rdist/defs.h
+++ b/usr/src/usr.bin/rdist/defs.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)defs.h      5.6 (Berkeley) %G%
+ *     @(#)defs.h      5.7 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -130,7 +130,6 @@ extern struct group *gr;    /* pointer to static area used by getgrent */
 extern char host[];            /* host name of master copy */
 extern char buf[];             /* general purpose buffer */
 extern int errno;              /* system error number */
 extern char host[];            /* host name of master copy */
 extern char buf[];             /* general purpose buffer */
 extern int errno;              /* system error number */

-extern char *sys_errlist[];

 
 char *makestr();
 struct namelist *makenl();
 
 char *makestr();
 struct namelist *makenl();

diff --git a/usr/src/usr.bin/rdist/docmd.c b/usr/src/usr.bin/rdist/docmd.c
index 448c707..3287e83 100644 (file)
--- a/usr/src/usr.bin/rdist/docmd.c
+++ b/usr/src/usr.bin/rdist/docmd.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)docmd.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)docmd.c    5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -318,7 +318,7 @@ dodcolon(filev, files, stamp, cmds)
                return;
        }
        if (stat(stamp, &stb) < 0) {
                return;
        }
        if (stat(stamp, &stb) < 0) {

-               error("%s: %s\n", stamp, sys_errlist[errno]);
+               error("%s: %s\n", stamp, strerror(errno));

                return;
        }
        if (debug)
                return;
        }
        if (debug)


@@ -330,7 +330,7 @@ dodcolon(filev, files, stamp, cmds)
                tfp = NULL;
        else {
                if ((tfp = fopen(tmpfile, "w")) == NULL) {
                tfp = NULL;
        else {
                if ((tfp = fopen(tmpfile, "w")) == NULL) {

-                       error("%s: %s\n", stamp, sys_errlist[errno]);
+                       error("%s: %s\n", stamp, strerror(errno));

                        return;
                }
                (void) gettimeofday(&tv[0], &tz);
                        return;
                }
                (void) gettimeofday(&tv[0], &tz);


@@ -389,7 +389,7 @@ cmptime(name)
                        tp++;
        }
        if (access(name, 4) < 0 || stat(name, &stb) < 0) {
                        tp++;
        }
        if (access(name, 4) < 0 || stat(name, &stb) < 0) {

-               error("%s: %s\n", name, sys_errlist[errno]);
+               error("%s: %s\n", name, strerror(errno));

                return;
        }
 
                return;
        }
 


@@ -423,7 +423,7 @@ rcmptime(st)
                printf("rcmptime(%x)\n", st);
 
        if ((d = opendir(target)) == NULL) {
                printf("rcmptime(%x)\n", st);
 
        if ((d = opendir(target)) == NULL) {

-               error("%s: %s\n", target, sys_errlist[errno]);
+               error("%s: %s\n", target, strerror(errno));

                return;
        }
        otp = tp;
                return;
        }
        otp = tp;


@@ -474,11 +474,11 @@ notify(file, rhost, to, lmod)
                return;
 
        if ((fd = open(file, 0)) < 0) {
                return;
 
        if ((fd = open(file, 0)) < 0) {

-               error("%s: %s\n", file, sys_errlist[errno]);
+               error("%s: %s\n", file, strerror(errno));

                return;
        }
        if (fstat(fd, &stb) < 0) {
                return;
        }
        if (fstat(fd, &stb) < 0) {

-               error("%s: %s\n", file, sys_errlist[errno]);
+               error("%s: %s\n", file, strerror(errno));

                (void) close(fd);
                return;
        }
                (void) close(fd);
                return;
        }

diff --git a/usr/src/usr.bin/rdist/expand.c b/usr/src/usr.bin/rdist/expand.c
index 3a01a5d..f57bafd 100644 (file)
--- a/usr/src/usr.bin/rdist/expand.c
+++ b/usr/src/usr.bin/rdist/expand.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)expand.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)expand.c   5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -300,7 +300,7 @@ patherr1:
        closedir(dirp);
 patherr2:
        strcat(path, ": ");
        closedir(dirp);
 patherr2:
        strcat(path, ": ");

-       strcat(path, sys_errlist[errno]);
+       strcat(path, strerror(errno));

        yyerror(path);
 }
 
        yyerror(path);
 }
 

diff --git a/usr/src/usr.bin/rdist/server.c b/usr/src/usr.bin/rdist/server.c
index 65c6951..2653756 100644 (file)
--- a/usr/src/usr.bin/rdist/server.c
+++ b/usr/src/usr.bin/rdist/server.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)server.c   5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)server.c   5.11 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -283,7 +283,7 @@ sendf(rname, opts)
        if (except(target))
                return;
        if ((opts & FOLLOW ? stat(target, &stb) : lstat(target, &stb)) < 0) {
        if (except(target))
                return;
        if ((opts & FOLLOW ? stat(target, &stb) : lstat(target, &stb)) < 0) {

-               error("%s: %s\n", target, sys_errlist[errno]);
+               error("%s: %s\n", target, strerror(errno));

                return;
        }
        if ((u = update(rname, opts, &stb)) == 0) {
                return;
        }
        if ((u = update(rname, opts, &stb)) == 0) {


@@ -318,7 +318,7 @@ sendf(rname, opts)
        switch (stb.st_mode & S_IFMT) {
        case S_IFDIR:
                if ((d = opendir(target)) == NULL) {
        switch (stb.st_mode & S_IFMT) {
        case S_IFDIR:
                if ((d = opendir(target)) == NULL) {

-                       error("%s: %s\n", target, sys_errlist[errno]);
+                       error("%s: %s\n", target, strerror(errno));

                        return;
                }
                (void) sprintf(buf, "D%o %04o 0 0 %s %s %s\n", opts,
                        return;
                }
                (void) sprintf(buf, "D%o %04o 0 0 %s %s %s\n", opts,


@@ -431,7 +431,7 @@ sendf(rname, opts)
        }
 
        if ((f = open(target, 0)) < 0) {
        }
 
        if ((f = open(target, 0)) < 0) {

-               error("%s: %s\n", target, sys_errlist[errno]);
+               error("%s: %s\n", target, strerror(errno));

                return;
        }
        (void) sprintf(buf, "R%o %o %ld %ld %s %s %s\n", opts,
                return;
        }
        (void) sprintf(buf, "R%o %o %ld %ld %s %s %s\n", opts,


@@ -627,7 +627,7 @@ query(name)
                if (errno == ENOENT)
                        (void) write(rem, "N\n", 2);
                else
                if (errno == ENOENT)
                        (void) write(rem, "N\n", 2);
                else

-                       error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+                       error("%s:%s: %s\n", host, target, strerror(errno));

                *tp = '\0';
                return;
        }
                *tp = '\0';
                return;
        }


@@ -747,7 +747,7 @@ recvf(cmd, type)
                                ack();
                        return;
                }
                                ack();
                        return;
                }

-               error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+               error("%s:%s: %s\n", host, target, strerror(errno));

                tp = stp[--catname];
                *tp = '\0';
                return;
                tp = stp[--catname];
                *tp = '\0';
                return;


@@ -842,7 +842,7 @@ recvf(cmd, type)
                return;
        }
        if (wrerr) {
                return;
        }
        if (wrerr) {

-               error("%s:%s: %s\n", host, new, sys_errlist[olderrno]);
+               error("%s:%s: %s\n", host, new, strerror(errno));

                (void) unlink(new);
                return;
        }
                (void) unlink(new);
                return;
        }


@@ -854,7 +854,7 @@ recvf(cmd, type)
                        goto badt;
                if ((f2 = fopen(new, "r")) == NULL) {
                badn:
                        goto badt;
                if ((f2 = fopen(new, "r")) == NULL) {
                badn:

-                       error("%s:%s: %s\n", host, new, sys_errlist[errno]);
+                       error("%s:%s: %s\n", host, new, strerror(errno));

                        (void) unlink(new);
                        return;
                }
                        (void) unlink(new);
                        return;
                }


@@ -886,7 +886,7 @@ recvf(cmd, type)
        tvp[1].tv_sec = mtime;
        tvp[1].tv_usec = 0;
        if (utimes(new, tvp) < 0) {
        tvp[1].tv_sec = mtime;
        tvp[1].tv_usec = 0;
        if (utimes(new, tvp) < 0) {

-               note("%s:utimes failed %s: %s\n", host, new, sys_errlist[errno]);
+               note("%s:utimes failed %s: %s\n", host, new, strerror(errno));

        }
        if (chog(new, owner, group, mode) < 0) {
                (void) unlink(new);
        }
        if (chog(new, owner, group, mode) < 0) {
                (void) unlink(new);


@@ -895,7 +895,7 @@ recvf(cmd, type)
 fixup:
        if (rename(new, target) < 0) {
 badt:
 fixup:
        if (rename(new, target) < 0) {
 badt:

-               error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+               error("%s:%s: %s\n", host, target, strerror(errno));

                (void) unlink(new);
                return;
        }
                (void) unlink(new);
                return;
        }


@@ -948,12 +948,12 @@ hardlink(cmd)
        }
        if (chkparent(target) < 0 ) {
                error("%s:%s: %s (no parent)\n",
        }
        if (chkparent(target) < 0 ) {
                error("%s:%s: %s (no parent)\n",

-                       host, target, sys_errlist[errno]);
+                       host, target, strerror(errno));

                return;
        }
        if (exists && (unlink(target) < 0)) {
                error("%s:%s: %s (unlink)\n",
                return;
        }
        if (exists && (unlink(target) < 0)) {
                error("%s:%s: %s (unlink)\n",

-                       host, target, sys_errlist[errno]);
+                       host, target, strerror(errno));

                return;
        }
        if (link(oldname, target) < 0) {
                return;
        }
        if (link(oldname, target) < 0) {


@@ -1050,7 +1050,7 @@ ok:
        if (chown(file, uid, gid) < 0 ||
            (mode & 07000) && chmod(file, mode) < 0) {
                note("%s: chown or chmod failed: file %s:  %s",
        if (chown(file, uid, gid) < 0 ||
            (mode & 07000) && chmod(file, mode) < 0) {
                note("%s: chown or chmod failed: file %s:  %s",

-                            host, file, sys_errlist[errno]);
+                            host, file, strerror(errno));

        }
        if (userid)
                setreuid(0, userid);
        }
        if (userid)
                setreuid(0, userid);


@@ -1159,7 +1159,7 @@ clean(cp)
                return;
        }
        if ((d = opendir(target)) == NULL) {
                return;
        }
        if ((d = opendir(target)) == NULL) {

-               error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+               error("%s:%s: %s\n", host, target, strerror(errno));

                return;
        }
        ack();
                return;
        }
        ack();


@@ -1181,7 +1181,7 @@ clean(cp)
                        ;
                tp--;
                if (lstat(target, &stb) < 0) {
                        ;
                tp--;
                if (lstat(target, &stb) < 0) {

-                       error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+                       error("%s:%s: %s\n", host, target, strerror(errno));

                        continue;
                }
                (void) sprintf(buf, "Q%s\n", dp->d_name);
                        continue;
                }
                (void) sprintf(buf, "Q%s\n", dp->d_name);


@@ -1259,7 +1259,7 @@ remove(stp)
                        ;
                tp--;
                if (lstat(target, &stb) < 0) {
                        ;
                tp--;
                if (lstat(target, &stb) < 0) {

-                       error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+                       error("%s:%s: %s\n", host, target, strerror(errno));

                        continue;
                }
                remove(&stb);
                        continue;
                }
                remove(&stb);


@@ -1269,7 +1269,7 @@ remove(stp)
        *tp = '\0';
        if (rmdir(target) < 0) {
 bad:
        *tp = '\0';
        if (rmdir(target) < 0) {
 bad:

-               error("%s:%s: %s\n", host, target, sys_errlist[errno]);
+               error("%s:%s: %s\n", host, target, strerror(errno));

                return;
        }
 removed:
                return;
        }
 removed:


@@ -1291,7 +1291,7 @@ dospecial(cmd)
        extern int userid, groupid;
 
        if (pipe(fd) < 0) {
        extern int userid, groupid;
 
        if (pipe(fd) < 0) {

-               error("%s\n", sys_errlist[errno]);
+               error("%s\n", strerror(errno));

                return;
        }
        if ((pid = fork()) == 0) {
                return;
        }
        if ((pid = fork()) == 0) {