Hello:

The last revision to src/usr.sbin/cron/macros.h removed some custom
macros (OK_EXIT, ERROR_EXIT) that src/usr.bin/at/at.c relies on.
Here's a patch that moves at.c to the standard ones (EXIT_FAILURE,
EXIT_SUCCESS).

Cheers,
-Nima
-- 
The pudding is in the proof.


Index: at.c
===================================================================
RCS file: /cvs/src/usr.bin/at/at.c,v
retrieving revision 1.58
diff -u -r1.58 at.c
--- at.c        3 Mar 2011 15:06:43 -0000       1.58
+++ at.c        23 Aug 2011 14:44:08 -0000
@@ -82,7 +82,7 @@
                PRIV_END;
        }
 
-       exit(ERROR_EXIT);
+       exit(EXIT_FAILURE);
 }
 
 /*
@@ -98,7 +98,7 @@
                PRIV_END;
        }
 
-       exit(ERROR_EXIT);
+       exit(EXIT_FAILURE);
 }
 
 /*
@@ -115,7 +115,7 @@
                PRIV_END;
        }
 
-       exit(ERROR_EXIT);
+       exit(EXIT_FAILURE);
 }
 
 /*
@@ -140,7 +140,7 @@
                PRIV_END;
        }
 
-       _exit(ERROR_EXIT);
+       _exit(EXIT_FAILURE);
 }
 
 /* ARGSUSED */
@@ -669,7 +669,7 @@
                                            " may %s other users' jobs\n",
                                            ProgramName, what == ATRM
                                            ? "remove" : "view");
-                                       exit(ERROR_EXIT);
+                                       exit(EXIT_FAILURE);
                                }
                                uids[uids_len++] = pw->pw_uid;
                        } else
@@ -876,7 +876,7 @@
 
        if ((pw = getpwuid(uid)) == NULL) {
                perror("Cannot access password database");
-               exit(ERROR_EXIT);
+               exit(EXIT_FAILURE);
        }
 
        PRIV_START;
@@ -913,7 +913,7 @@
                    "usage: batch [-m] [-f file] [-q queue] [timespec]\n");
                break;
        }
-       exit(ERROR_EXIT);
+       exit(EXIT_FAILURE);
 }
 
 int
@@ -1076,7 +1076,7 @@
                        if (argc == 0)
                                usage();
                        else if ((timer = parsetime(argc, argv)) == -1)
-                               exit(ERROR_EXIT);
+                               exit(EXIT_FAILURE);
                }
                writefile(cwd, timer, queue);
                break;
@@ -1090,7 +1090,7 @@
                if (argc == 0)
                        timer = time(NULL);
                else if ((timer = parsetime(argc, argv)) == -1)
-                       exit(ERROR_EXIT);
+                       exit(EXIT_FAILURE);
 
                writefile(cwd, timer, queue);
                break;
@@ -1099,5 +1099,5 @@
                panic("Internal error");
                break;
        }
-       exit(OK_EXIT);
+       exit(EXIT_SUCCESS);
 }

Reply via email to