diff options
author | ed <ed@FreeBSD.org> | 2011-11-06 17:32:29 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2011-11-06 17:32:29 +0000 |
commit | a2c6b647f175a4883ba5ab0f8ad139455fda88a0 (patch) | |
tree | 58a59ad89bbdc9e16f323354e08a4db07e98c2e1 | |
parent | 8fdc44b4598afdb5f444d4e5da3dedc3c347a37f (diff) | |
download | FreeBSD-src-a2c6b647f175a4883ba5ab0f8ad139455fda88a0.zip FreeBSD-src-a2c6b647f175a4883ba5ab0f8ad139455fda88a0.tar.gz |
Add missing static keywords to at(1).
While there, tidy up the privs.h part, where at.c has to #define to
declare some globals. Also group static and non-static global variables
in at.c.
-rw-r--r-- | usr.bin/at/at.c | 14 | ||||
-rw-r--r-- | usr.bin/at/parsetime.c | 2 | ||||
-rw-r--r-- | usr.bin/at/privs.h | 11 |
3 files changed, 9 insertions, 18 deletions
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index c036013..283965e 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$"); #include "panic.h" #include "parsetime.h" #include "perm.h" - -#define MAIN #include "privs.h" /* Macros */ @@ -90,22 +88,22 @@ enum { ATQ, ATRM, AT, BATCH, CAT }; /* what program we want to run */ /* File scope variables */ -const char *no_export[] = -{ +static const char *no_export[] = { "TERM", "TERMCAP", "DISPLAY", "_" -} ; +}; static int send_mail = 0; +static char *atinput = NULL; /* where to get input from */ +static char atqueue = 0; /* which queue to examine for jobs (atq) */ /* External variables */ extern char **environ; int fcreated; char atfile[] = ATJOB_DIR "12345678901234"; - -char *atinput = (char*)0; /* where to get input from */ -char atqueue = 0; /* which queue to examine for jobs (atq) */ char atverify = 0; /* verify time instead of queuing job */ char *namep; +uid_t real_uid, effective_uid; +gid_t real_gid, effective_gid; /* Function declarations */ diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c index 195a38d..8c83bcc 100644 --- a/usr.bin/at/parsetime.c +++ b/usr.bin/at/parsetime.c @@ -72,7 +72,7 @@ enum { /* symbols */ /* parse translation table - table driven parsers can be your FRIEND! */ -struct { +static const struct { const char *name; /* token name */ int value; /* token id */ int plural; /* is this plural? */ diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h index 50dd6b1..c84f277 100644 --- a/usr.bin/at/privs.h +++ b/usr.bin/at/privs.h @@ -59,15 +59,8 @@ * to the real userid before calling any of them. */ -#ifndef MAIN -extern -#endif -uid_t real_uid, effective_uid; - -#ifndef MAIN -extern -#endif -gid_t real_gid, effective_gid; +extern uid_t real_uid, effective_uid; +extern gid_t real_gid, effective_gid; #define RELINQUISH_PRIVS { \ real_uid = getuid(); \ |