From owner-svn-src-stable-7@FreeBSD.ORG Sun Mar 4 16:24:59 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A89C41065687; Sun, 4 Mar 2012 16:24:59 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D60E8FC12; Sun, 4 Mar 2012 16:24:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q24GOxHA042857; Sun, 4 Mar 2012 16:24:59 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q24GOx7A042855; Sun, 4 Mar 2012 16:24:59 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201203041624.q24GOx7A042855@svn.freebsd.org> From: Eitan Adler Date: Sun, 4 Mar 2012 16:24:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232500 - stable/7/sys/dev/acpica X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Mar 2012 16:24:59 -0000 Author: eadler Date: Sun Mar 4 16:24:58 2012 New Revision: 232500 URL: http://svn.freebsd.org/changeset/base/232500 Log: MFC r227626, r227642: - be more precise about the unit of measurement Approved by: cperciva Modified: stable/7/sys/dev/acpica/acpi_thermal.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/acpica/acpi_thermal.c ============================================================================== --- stable/7/sys/dev/acpica/acpi_thermal.c Sun Mar 4 16:21:20 2012 (r232499) +++ stable/7/sys/dev/acpica/acpi_thermal.c Sun Mar 4 16:24:58 2012 (r232500) @@ -243,7 +243,7 @@ acpi_tz_attach(device_t dev) SYSCTL_ADD_INT(&acpi_tz_sysctl_ctx, SYSCTL_CHILDREN(acpi_tz_sysctl_tree), OID_AUTO, "polling_rate", CTLFLAG_RW, - &acpi_tz_polling_rate, 0, "monitor polling rate"); + &acpi_tz_polling_rate, 0, "monitor polling interval in seconds"); SYSCTL_ADD_INT(&acpi_tz_sysctl_ctx, SYSCTL_CHILDREN(acpi_tz_sysctl_tree), OID_AUTO, "user_override", CTLFLAG_RW, &acpi_tz_override, 0, From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 5 19:32:45 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 50C5E106566B; Mon, 5 Mar 2012 19:32:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3DBAC8FC1D; Mon, 5 Mar 2012 19:32:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q25JWjv9001545; Mon, 5 Mar 2012 19:32:45 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q25JWiB6001530; Mon, 5 Mar 2012 19:32:44 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201203051932.q25JWiB6001530@svn.freebsd.org> From: Xin LI Date: Mon, 5 Mar 2012 19:32:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232568 - in stable/7/usr.sbin/cron: cron crontab doc lib X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Mar 2012 19:32:45 -0000 Author: delphij Date: Mon Mar 5 19:32:44 2012 New Revision: 232568 URL: http://svn.freebsd.org/changeset/base/232568 Log: Merge all revisions except r199804 back to stable/7. Modified: stable/7/usr.sbin/cron/cron/Makefile stable/7/usr.sbin/cron/cron/cron.c stable/7/usr.sbin/cron/cron/cron.h stable/7/usr.sbin/cron/cron/database.c stable/7/usr.sbin/cron/cron/do_command.c stable/7/usr.sbin/cron/cron/externs.h stable/7/usr.sbin/cron/crontab/Makefile stable/7/usr.sbin/cron/crontab/crontab.5 stable/7/usr.sbin/cron/crontab/crontab.c stable/7/usr.sbin/cron/doc/CHANGES stable/7/usr.sbin/cron/doc/MAIL stable/7/usr.sbin/cron/lib/Makefile stable/7/usr.sbin/cron/lib/entry.c stable/7/usr.sbin/cron/lib/misc.c Directory Properties: stable/7/usr.sbin/cron/ (props changed) stable/7/usr.sbin/cron/cron/ (props changed) stable/7/usr.sbin/cron/crontab/ (props changed) Modified: stable/7/usr.sbin/cron/cron/Makefile ============================================================================== --- stable/7/usr.sbin/cron/cron/Makefile Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/cron/Makefile Mon Mar 5 19:32:44 2012 (r232568) @@ -9,4 +9,6 @@ CFLAGS+= -DLOGIN_CAP -DPAM DPADD= ${LIBCRON} ${LIBPAM} ${LIBUTIL} LDADD= ${LIBCRON} ${MINUSLPAM} -lutil +WARNS?= 2 + .include Modified: stable/7/usr.sbin/cron/cron/cron.c ============================================================================== --- stable/7/usr.sbin/cron/cron/cron.c Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/cron/cron.c Mon Mar 5 19:32:44 2012 (r232568) @@ -32,17 +32,17 @@ static const char rcsid[] = #endif -static void usage __P((void)), - run_reboot_jobs __P((cron_db *)), - cron_tick __P((cron_db *)), - cron_sync __P((void)), - cron_sleep __P((cron_db *)), - cron_clean __P((cron_db *)), +static void usage(void), + run_reboot_jobs(cron_db *), + cron_tick(cron_db *), + cron_sync(void), + cron_sleep(cron_db *), + cron_clean(cron_db *), #ifdef USE_SIGCHLD - sigchld_handler __P((int)), + sigchld_handler(int), #endif - sighup_handler __P((int)), - parse_args __P((int c, char *v[])); + sighup_handler(int), + parse_args(int c, char *v[]); static time_t last_time = 0; static int dst_enabled = 0; Modified: stable/7/usr.sbin/cron/cron/cron.h ============================================================================== --- stable/7/usr.sbin/cron/cron/cron.h Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/cron/cron.h Mon Mar 5 19:32:44 2012 (r232568) @@ -199,49 +199,50 @@ typedef struct _cron_db { } cron_db; -void set_cron_uid __P((void)), - set_cron_cwd __P((void)), - load_database __P((cron_db *)), - open_logfile __P((void)), - sigpipe_func __P((void)), - job_add __P((entry *, user *)), - do_command __P((entry *, user *)), - link_user __P((cron_db *, user *)), - unlink_user __P((cron_db *, user *)), - free_user __P((user *)), - env_free __P((char **)), - unget_char __P((int, FILE *)), - free_entry __P((entry *)), - skip_comments __P((FILE *)), - log_it __P((char *, int, char *, char *)), - log_close __P((void)); - -int job_runqueue __P((void)), - set_debug_flags __P((char *)), - get_char __P((FILE *)), - get_string __P((char *, int, FILE *, char *)), - swap_uids __P((void)), - load_env __P((char *, FILE *)), - cron_pclose __P((FILE *)), - strcmp_until __P((char *, char *, int)), - allowed __P((char *)), - strdtb __P((char *)); - -char *env_get __P((char *, char **)), - *arpadate __P((time_t *)), - *mkprints __P((unsigned char *, unsigned int)), - *first_word __P((char *, char *)), - **env_init __P((void)), - **env_copy __P((char **)), - **env_set __P((char **, char *)); +void set_cron_uid(void), + set_cron_cwd(void), + load_database(cron_db *), + open_logfile(void), + sigpipe_func(void), + job_add(entry *, user *), + do_command(entry *, user *), + link_user(cron_db *, user *), + unlink_user(cron_db *, user *), + free_user(user *), + env_free(char **), + unget_char(int, FILE *), + free_entry(entry *), + skip_comments(FILE *), + log_it(char *, int, char *, char *), + log_close(void); + +int job_runqueue(void), + set_debug_flags(char *), + get_char(FILE *), + get_string(char *, int, FILE *, char *), + swap_uids(void), + swap_uids_back(void), + load_env(char *, FILE *), + cron_pclose(FILE *), + strcmp_until(char *, char *, int), + allowed(char *), + strdtb(char *); + +char *env_get(char *, char **), + *arpadate(time_t *), + *mkprints(unsigned char *, unsigned int), + *first_word(char *, char *), + **env_init(void), + **env_copy(char **), + **env_set(char **, char *); -user *load_user __P((int, struct passwd *, char *)), - *find_user __P((cron_db *, char *)); +user *load_user(int, struct passwd *, char *), + *find_user(cron_db *, char *); -entry *load_entry __P((FILE *, void (*)(), - struct passwd *, char **)); +entry *load_entry(FILE *, void (*)(char *), + struct passwd *, char **); -FILE *cron_popen __P((char *, char *, entry *)); +FILE *cron_popen(char *, char *, entry *); /* in the C tradition, we only create Modified: stable/7/usr.sbin/cron/cron/database.c ============================================================================== --- stable/7/usr.sbin/cron/cron/database.c Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/cron/database.c Mon Mar 5 19:32:44 2012 (r232568) @@ -33,9 +33,9 @@ static const char rcsid[] = #define TMAX(a,b) ((a)>(b)?(a):(b)) -static void process_crontab __P((char *, char *, char *, +static void process_crontab(char *, char *, char *, struct stat *, - cron_db *, cron_db *)); + cron_db *, cron_db *); void Modified: stable/7/usr.sbin/cron/cron/do_command.c ============================================================================== --- stable/7/usr.sbin/cron/cron/do_command.c Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/cron/do_command.c Mon Mar 5 19:32:44 2012 (r232568) @@ -38,8 +38,8 @@ static const char rcsid[] = #endif -static void child_process __P((entry *, user *)), - do_univ __P((user *)); +static void child_process(entry *, user *), + do_univ(user *); void @@ -147,7 +147,7 @@ child_process(e, u) #ifdef USE_SIGCHLD /* our parent is watching for our death by catching SIGCHLD. we * do not care to watch for our children's deaths this way -- we - * use wait() explictly. so we have to disable the signal (which + * use wait() explicitly. so we have to disable the signal (which * was inherited from the parent). */ (void) signal(SIGCHLD, SIG_DFL); Modified: stable/7/usr.sbin/cron/cron/externs.h ============================================================================== --- stable/7/usr.sbin/cron/cron/externs.h Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/cron/externs.h Mon Mar 5 19:32:44 2012 (r232568) @@ -1,3 +1,5 @@ +/* $FreeBSD$ */ + /* Copyright 1993,1994 by Paul Vixie * All rights reserved * @@ -71,7 +73,7 @@ extern void *malloc(), *realloc(); * external variables needed for the interface. */ #if (!defined(BSD) || (BSD < 198911)) && !defined(ATT) && !defined(UNICOS) -int getopt __P((int, char * const *, const char *)); +int getopt(int, char * const *, const char *); #endif #if (!defined(BSD) || (BSD < 199103)) @@ -109,19 +111,19 @@ extern int optind, opterr, optopt; #endif #ifdef NEED_STRCASECMP -extern int strcasecmp __P((char *, char *)); +extern int strcasecmp(char *, char *); #endif #ifdef NEED_STRDUP -extern char *strdup __P((char *)); +extern char *strdup(char *); #endif #ifdef NEED_STRERROR -extern char *strerror __P((int)); +extern char *strerror(int); #endif #ifdef NEED_FLOCK -extern int flock __P((int, int)); +extern int flock(int, int); # define LOCK_SH 1 # define LOCK_EX 2 # define LOCK_NB 4 @@ -129,17 +131,17 @@ extern int flock __P((int, int)); #endif #ifdef NEED_SETSID -extern int setsid __P((void)); +extern int setsid(void); #endif #ifdef NEED_GETDTABLESIZE -extern int getdtablesize __P((void)); +extern int getdtablesize(void); #endif #ifdef NEED_SETENV -extern int setenv __P((char *, char *, int)); +extern int setenv(char *, char *, int); #endif #ifdef NEED_VFORK -extern PID_T vfork __P((void)); +extern PID_T vfork(void); #endif Modified: stable/7/usr.sbin/cron/crontab/Makefile ============================================================================== --- stable/7/usr.sbin/cron/crontab/Makefile Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/crontab/Makefile Mon Mar 5 19:32:44 2012 (r232568) @@ -8,6 +8,8 @@ BINOWN= root BINMODE=4555 PRECIOUSPROG= +WARNS?= 3 + CFLAGS+= -I${.CURDIR}/../cron DPADD= ${LIBCRON} ${LIBMD} ${LIBUTIL} Modified: stable/7/usr.sbin/cron/crontab/crontab.5 ============================================================================== --- stable/7/usr.sbin/cron/crontab/crontab.5 Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/crontab/crontab.5 Mon Mar 5 19:32:44 2012 (r232568) @@ -118,7 +118,7 @@ is defined (and non-empty), mail is sent to the user so named. .Ev MAILTO may also be used to direct mail to multiple recipients -by seperating recipient users with a comma. +by separating recipient users with a comma. If .Ev MAILTO is defined but empty (MAILTO=""), no Modified: stable/7/usr.sbin/cron/crontab/crontab.c ============================================================================== --- stable/7/usr.sbin/cron/crontab/crontab.c Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/crontab/crontab.c Mon Mar 5 19:32:44 2012 (r232568) @@ -63,18 +63,17 @@ static FILE *NewCrontab; static int CheckErrorCount; static enum opt_t Option; static struct passwd *pw; -static void list_cmd __P((void)), - delete_cmd __P((void)), - edit_cmd __P((void)), - poke_daemon __P((void)), - check_error __P((char *)), - parse_args __P((int c, char *v[])); -static int replace_cmd __P((void)); +static void list_cmd(void), + delete_cmd(void), + edit_cmd(void), + poke_daemon(void), + check_error(char *), + parse_args(int c, char *v[]); +static int replace_cmd(void); static void -usage(msg) - char *msg; +usage(char *msg) { fprintf(stderr, "crontab: usage error: %s\n", msg); fprintf(stderr, "%s\n%s\n", @@ -85,9 +84,7 @@ usage(msg) int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { int exitstatus; @@ -138,6 +135,7 @@ parse_args(argc, argv) if (!(pw = getpwuid(getuid()))) errx(ERROR_EXIT, "your UID isn't in the passwd file, bailing out"); + bzero(pw->pw_passwd, strlen(pw->pw_passwd)); (void) strncpy(User, pw->pw_name, (sizeof User)-1); User[(sizeof User)-1] = '\0'; strcpy(RealUser, User); @@ -154,6 +152,7 @@ parse_args(argc, argv) errx(ERROR_EXIT, "must be privileged to use -u"); if (!(pw = getpwnam(optarg))) errx(ERROR_EXIT, "user `%s' unknown", optarg); + bzero(pw->pw_passwd, strlen(pw->pw_passwd)); (void) strncpy(User, pw->pw_name, (sizeof User)-1); User[(sizeof User)-1] = '\0'; break; @@ -195,6 +194,17 @@ parse_args(argc, argv) } if (Option == opt_replace) { + /* relinquish the setuid status of the binary during + * the open, lest nonroot users read files they should + * not be able to read. we can't use access() here + * since there's a race condition. thanks go out to + * Arnt Gulbrandsen for spotting + * the race. + */ + + if (swap_uids() < OK) + err(ERROR_EXIT, "swapping uids"); + /* we have to open the file here because we're going to * chdir(2) into /var/cron before we get around to * reading the file. @@ -205,21 +215,11 @@ parse_args(argc, argv) !strcmp(resolved_path, SYSCRONTAB)) { err(ERROR_EXIT, SYSCRONTAB " must be edited manually"); } else { - /* relinquish the setuid status of the binary during - * the open, lest nonroot users read files they should - * not be able to read. we can't use access() here - * since there's a race condition. thanks go out to - * Arnt Gulbrandsen for spotting - * the race. - */ - - if (swap_uids() < OK) - err(ERROR_EXIT, "swapping uids"); if (!(NewCrontab = fopen(Filename, "r"))) err(ERROR_EXIT, "%s", Filename); - if (swap_uids() < OK) - err(ERROR_EXIT, "swapping uids back"); } + if (swap_uids_back() < OK) + err(ERROR_EXIT, "swapping uids back"); } Debug(DMISC, ("user=%s, file=%s, option=%s\n", @@ -261,7 +261,7 @@ list_cmd() { FILE *f; log_it(RealUser, Pid, "LIST", User); - (void) sprintf(n, CRON_TAB(User)); + (void) snprintf(n, sizeof(n), CRON_TAB(User)); if (!(f = fopen(n, "r"))) { if (errno == ENOENT) errx(ERROR_EXIT, "no crontab for %s", User); @@ -291,7 +291,7 @@ delete_cmd() { } log_it(RealUser, Pid, "DELETE", User); - (void) sprintf(n, CRON_TAB(User)); + (void) snprintf(n, sizeof(n), CRON_TAB(User)); if (unlink(n)) { if (errno == ENOENT) errx(ERROR_EXIT, "no crontab for %s", User); @@ -325,7 +325,7 @@ edit_cmd() { char new_md5[MD5_SIZE]; log_it(RealUser, Pid, "BEGIN EDIT", User); - (void) sprintf(n, CRON_TAB(User)); + (void) snprintf(n, sizeof(n), CRON_TAB(User)); if (!(f = fopen(n, "r"))) { if (errno != ENOENT) err(ERROR_EXIT, "%s", n); @@ -335,7 +335,7 @@ edit_cmd() { } um = umask(077); - (void) sprintf(Filename, "/tmp/crontab.XXXXXXXXXX"); + (void) snprintf(Filename, sizeof(Filename), "/tmp/crontab.XXXXXXXXXX"); if ((t = mkstemp(Filename)) == -1) { warn("%s", Filename); (void) umask(um); @@ -364,11 +364,15 @@ edit_cmd() { goto fatal; } again: + if (swap_uids() < OK) + err(ERROR_EXIT, "swapping uids"); if (stat(Filename, &statbuf) < 0) { warn("stat"); fatal: unlink(Filename); exit(ERROR_EXIT); } + if (swap_uids_back() < OK) + err(ERROR_EXIT, "swapping uids back"); if (statbuf.st_dev != fsbuf.st_dev || statbuf.st_ino != fsbuf.st_ino) errx(ERROR_EXIT, "temp file must be edited in place"); if (MD5File(Filename, orig_md5) == NULL) { @@ -412,14 +416,14 @@ edit_cmd() { /* parent */ { - void (*f[4])(); - f[0] = signal(SIGHUP, SIG_IGN); - f[1] = signal(SIGINT, SIG_IGN); - f[2] = signal(SIGTERM, SIG_IGN); + void (*sig[3])(int signal); + sig[0] = signal(SIGHUP, SIG_IGN); + sig[1] = signal(SIGINT, SIG_IGN); + sig[2] = signal(SIGTERM, SIG_IGN); xpid = wait(&waiter); - signal(SIGHUP, f[0]); - signal(SIGINT, f[1]); - signal(SIGTERM, f[2]); + signal(SIGHUP, sig[0]); + signal(SIGINT, sig[1]); + signal(SIGTERM, sig[2]); } if (xpid != pid) { warnx("wrong PID (%d != %d) from \"%s\"", xpid, pid, editor); @@ -434,6 +438,8 @@ edit_cmd() { editor, WTERMSIG(waiter), WCOREDUMP(waiter) ?"" :"no "); goto fatal; } + if (swap_uids() < OK) + err(ERROR_EXIT, "swapping uids"); if (stat(Filename, &statbuf) < 0) { warn("stat"); goto fatal; @@ -444,6 +450,8 @@ edit_cmd() { warn("MD5"); goto fatal; } + if (swap_uids_back() < OK) + err(ERROR_EXIT, "swapping uids back"); if (strcmp(orig_md5, new_md5) == 0 && !syntax_error) { warnx("no changes made to crontab"); goto remove; @@ -502,8 +510,9 @@ replace_cmd() { return (-2); } - (void) sprintf(n, "tmp.%d", Pid); - (void) sprintf(tn, CRON_TAB(n)); + (void) snprintf(n, sizeof(n), "tmp.%d", Pid); + (void) snprintf(tn, sizeof(tn), CRON_TAB(n)); + if (!(tmp = fopen(tn, "w+"))) { warn("%s", tn); return (-2); @@ -590,12 +599,13 @@ replace_cmd() { return (-2); } - (void) sprintf(n, CRON_TAB(User)); + (void) snprintf(n, sizeof(n), CRON_TAB(User)); if (rename(tn, n)) { warn("error renaming %s to %s", tn, n); unlink(tn); return (-2); } + log_it(RealUser, Pid, "REPLACE", User); poke_daemon(); Modified: stable/7/usr.sbin/cron/doc/CHANGES ============================================================================== --- stable/7/usr.sbin/cron/doc/CHANGES Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/doc/CHANGES Mon Mar 5 19:32:44 2012 (r232568) @@ -1,3 +1,6 @@ +$FreeBSD$ +-------- + Vixie Cron Changes from V2 to V3 Paul Vixie 29-Dec-1993 @@ -20,7 +23,7 @@ be reread whenever it changes. I also added a "-e" option to crontab(1). Nine people also sent me diffs to add this option, but I had already implemented it on my own. I actually -released an interrim version (V2.2, I think) for limited testing, and got a +released an interim version (V2.2, I think) for limited testing, and got a chance to fix a bad security bug in the "-e" option thanks to XXX. The daemon used to be extraordinarily sloppy in its use of file descriptors. @@ -57,7 +60,7 @@ which explains why a lot of other people syslog even when they configured it that way :-). Steve Simmons told me first, though, so he gets the point. -An interrim version of the daemon tried to "stat" every file before +An interim version of the daemon tried to "stat" every file before executing it; this turned out to be a horribly bad idea since finding the name of a file from a shell command is a hard job (that's why we have shells, right?) I removed this bogus code. Dave Burgess gets the point. Modified: stable/7/usr.sbin/cron/doc/MAIL ============================================================================== --- stable/7/usr.sbin/cron/doc/MAIL Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/doc/MAIL Mon Mar 5 19:32:44 2012 (r232568) @@ -186,7 +186,7 @@ five fields. Examples: (run command if day-of-month AND day-of-week are true) -Get the picture? This would be compatable with existing versions of +Get the picture? This would be compatible with existing versions of cron (which wouldn't currently be using any special characters, so that old crontabs would be handled correctly). Modified: stable/7/usr.sbin/cron/lib/Makefile ============================================================================== --- stable/7/usr.sbin/cron/lib/Makefile Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/lib/Makefile Mon Mar 5 19:32:44 2012 (r232568) @@ -4,6 +4,8 @@ LIB= cron INTERNALLIB= SRCS= entry.c env.c misc.c +WARNS?= 3 + CFLAGS+= -I${.CURDIR}/../cron CFLAGS+= -DLOGIN_CAP -DPAM Modified: stable/7/usr.sbin/cron/lib/entry.c ============================================================================== --- stable/7/usr.sbin/cron/lib/entry.c Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/lib/entry.c Mon Mar 5 19:32:44 2012 (r232568) @@ -41,10 +41,10 @@ typedef enum ecode { #endif } ecode_e; -static char get_list __P((bitstr_t *, int, int, char *[], int, FILE *)), - get_range __P((bitstr_t *, int, int, char *[], int, FILE *)), - get_number __P((int *, int, char *[], int, FILE *)); -static int set_element __P((bitstr_t *, int, int, int)); +static char get_list(bitstr_t *, int, int, char *[], int, FILE *), + get_range(bitstr_t *, int, int, char *[], int, FILE *), + get_number(int *, int, char *[], int, FILE *); +static int set_element(bitstr_t *, int, int, int); static char *ecodes[] = { @@ -87,7 +87,7 @@ free_entry(e) entry * load_entry(file, error_func, pw, envp) FILE *file; - void (*error_func)(); + void (*error_func)(char *); struct passwd *pw; char **envp; { @@ -254,7 +254,7 @@ load_entry(file, error_func, pw, envp) } } - /* make sundays equivilent */ + /* make sundays equivalent */ if (bit_test(e->dow, 0) || bit_test(e->dow, 7)) { bit_set(e->dow, 0); bit_set(e->dow, 7); Modified: stable/7/usr.sbin/cron/lib/misc.c ============================================================================== --- stable/7/usr.sbin/cron/lib/misc.c Mon Mar 5 19:13:19 2012 (r232567) +++ stable/7/usr.sbin/cron/lib/misc.c Mon Mar 5 19:32:44 2012 (r232568) @@ -324,9 +324,7 @@ skip_comments(file) * FALSE otherwise. */ static int -in_file(string, file) - char *string; - FILE *file; +in_file(char *string, FILE *file) { char line[MAX_TEMPSTR]; @@ -520,11 +518,8 @@ first_word(s, t) /* warning: * heavily ascii-dependent. */ -void -mkprint(dst, src, len) - register char *dst; - register unsigned char *src; - register int len; +static void +mkprint(register char *dst, register unsigned char *src, register int len) { while (len-- > 0) { From owner-svn-src-stable-7@FreeBSD.ORG Tue Mar 6 14:13:24 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EB081065670; Tue, 6 Mar 2012 14:13:24 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6DBE98FC12; Tue, 6 Mar 2012 14:13:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q26EDOSt043747; Tue, 6 Mar 2012 14:13:24 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26EDOf9043745; Tue, 6 Mar 2012 14:13:24 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201203061413.q26EDOf9043745@svn.freebsd.org> From: Remko Lodder Date: Tue, 6 Mar 2012 14:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232607 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2012 14:13:24 -0000 Author: remko Date: Tue Mar 6 14:13:23 2012 New Revision: 232607 URL: http://svn.freebsd.org/changeset/base/232607 Log: Merge r238821 Add sticky.8 to the obsolete files since it had been moved to sticky.7 Submitted by: maxim and pluknet With help from: dim (because of awkward merge conflicts) Modified: stable/7/ObsoleteFiles.inc (contents, props changed) Directory Properties: stable/7/ (props changed) Modified: stable/7/ObsoleteFiles.inc ============================================================================== --- stable/7/ObsoleteFiles.inc Tue Mar 6 14:10:57 2012 (r232606) +++ stable/7/ObsoleteFiles.inc Tue Mar 6 14:13:23 2012 (r232607) @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20110224: sticky.8 -> sticky.7 +OLD_FILES+=usr/share/man/man8/sticky.8.gz # 20101114: Remove long-obsolete MAKEDEV.8 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago From owner-svn-src-stable-7@FreeBSD.ORG Tue Mar 6 14:16:10 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 353ED106564A; Tue, 6 Mar 2012 14:16:10 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from mailout.jr-hosting.nl (mailout.jr-hosting.nl [IPv6:2a01:4f8:141:5ffd::1:25]) by mx1.freebsd.org (Postfix) with ESMTP id C2B178FC14; Tue, 6 Mar 2012 14:16:09 +0000 (UTC) Received: from mailgate.jr-hosting.nl (unknown [IPv6:2a01:4f8:141:5061::25]) by mailout.jr-hosting.nl (Postfix) with ESMTP id D9E673902868; Tue, 6 Mar 2012 14:16:07 +0000 (UTC) Received: from www.jr-hosting.nl (mail.jr-hosting.nl [78.47.69.234]) by mailgate.jr-hosting.nl (Postfix) with ESMTPSA id 3B7463F44F; Tue, 6 Mar 2012 15:16:07 +0100 (CET) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 06 Mar 2012 15:16:06 +0100 From: Remko Lodder To: Remko Lodder In-Reply-To: <201203061413.q26EDOf9043745@svn.freebsd.org> References: <201203061413.q26EDOf9043745@svn.freebsd.org> Message-ID: X-Sender: remko@elvandar.org User-Agent: Roundcube Webmail/0.7.1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r232607 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2012 14:16:10 -0000 On 06.03.2012 15:13, Remko Lodder wrote: The commit seems to mess up with the time schedule. Normally latest entries are on top, but the merge somehow got a lot of conflicts and now it isn't on top. Anyone has a suggestion on how to properly fix this? (Same goes for stable/8!) Thanks Remko > Author: remko > Date: Tue Mar 6 14:13:23 2012 > New Revision: 232607 > URL: http://svn.freebsd.org/changeset/base/232607 > > Log: > Merge r238821 > > Add sticky.8 to the obsolete files since it had been > moved to sticky.7 > > Submitted by: maxim and pluknet > > With help from: dim (because of awkward merge conflicts) > > Modified: > stable/7/ObsoleteFiles.inc (contents, props changed) > Directory Properties: > stable/7/ (props changed) > > Modified: stable/7/ObsoleteFiles.inc > > ============================================================================== > --- stable/7/ObsoleteFiles.inc Tue Mar 6 14:10:57 2012 (r232606) > +++ stable/7/ObsoleteFiles.inc Tue Mar 6 14:13:23 2012 (r232607) > @@ -14,6 +14,8 @@ > # The file is partitioned: OLD_FILES first, then OLD_LIBS and > OLD_DIRS last. > # > > +# 20110224: sticky.8 -> sticky.7 > +OLD_FILES+=usr/share/man/man8/sticky.8.gz > # 20101114: Remove long-obsolete MAKEDEV.8 > OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz > # 20101112: vgonel(9) has gone to private API a while ago -- /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | remko@EFnet X http://www.evilcoder.org/ | / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-svn-src-stable-7@FreeBSD.ORG Tue Mar 6 15:02:19 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 779691065676; Tue, 6 Mar 2012 15:02:19 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 65D968FC13; Tue, 6 Mar 2012 15:02:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q26F2JtD045481; Tue, 6 Mar 2012 15:02:19 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26F2JHM045479; Tue, 6 Mar 2012 15:02:19 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201203061502.q26F2JHM045479@svn.freebsd.org> From: Sean Bruno Date: Tue, 6 Mar 2012 15:02:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232610 - stable/7/sys/dev/mpt X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2012 15:02:19 -0000 Author: sbruno Date: Tue Mar 6 15:02:18 2012 New Revision: 232610 URL: http://svn.freebsd.org/changeset/base/232610 Log: MFC r232411 Fix a problem that was causing the mpt(4) driver to attach to MegaRAID cards that should be handled by the mfi(4) driver. The root of the problem is that the mpt(4) driver was masking off the bottom bit of the PCI device ID when deciding which cards to attach to. It appears that a number of the mpt(4) Fibre Channel cards had a LAN variant whose PCI device ID was just one bit off from the FC card's device ID. The FC cards were even and the LAN cards were odd. The problem was that this pattern wasn't carried over on the SAS and parallel SCSI mpt(4) cards. Luckily the SAS and parallel SCSI PCI device IDs were either even numbers, or they would get masked to a supported adjacent PCI device ID, and everything worked well. Now LSI is using some of the odd-numbered PCI device IDs between the 3Gb SAS device IDs for their new MegaRAID cards. This is causing the mpt(4) driver to attach to the RAID cards instead of the mfi(4) driver. The solution is to stop masking off the bottom bit of the device ID, and explicitly list the PCI device IDs of all supported cards. This change should be a no-op for mpt(4) hardware. The only intended functional change is that for the 929X, the is_fc variable gets set. It wasn't being set previously, but needs to be because the 929X is a Fibre Channel card. Reported by: Kashyap Desai Modified: stable/7/sys/dev/mpt/mpt_pci.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/mpt/mpt_pci.c ============================================================================== --- stable/7/sys/dev/mpt/mpt_pci.c Tue Mar 6 14:19:36 2012 (r232609) +++ stable/7/sys/dev/mpt/mpt_pci.c Tue Mar 6 15:02:18 2012 (r232610) @@ -129,18 +129,34 @@ __FBSDID("$FreeBSD$"); #define PCI_PRODUCT_LSI_FC919 0x0624 #endif +#ifndef PCI_PRODUCT_LSI_FC919_LAN +#define PCI_PRODUCT_LSI_FC919_LAN 0x0625 +#endif + #ifndef PCI_PRODUCT_LSI_FC929 #define PCI_PRODUCT_LSI_FC929 0x0622 #endif +#ifndef PCI_PRODUCT_LSI_FC929_LAN +#define PCI_PRODUCT_LSI_FC929_LAN 0x0623 +#endif + #ifndef PCI_PRODUCT_LSI_FC929X #define PCI_PRODUCT_LSI_FC929X 0x0626 #endif +#ifndef PCI_PRODUCT_LSI_FC929X_LAN +#define PCI_PRODUCT_LSI_FC929X_LAN 0x0627 +#endif + #ifndef PCI_PRODUCT_LSI_FC919X #define PCI_PRODUCT_LSI_FC919X 0x0628 #endif +#ifndef PCI_PRODUCT_LSI_FC919X_LAN +#define PCI_PRODUCT_LSI_FC919X_LAN 0x0629 +#endif + #ifndef PCI_PRODUCT_LSI_FC7X04X #define PCI_PRODUCT_LSI_FC7X04X 0x0640 #endif @@ -153,6 +169,10 @@ __FBSDID("$FreeBSD$"); #define PCI_PRODUCT_LSI_1030 0x0030 #endif +#ifndef PCI_PRODUCT_LSI_1030ZC +#define PCI_PRODUCT_LSI_1030ZC 0x0031 +#endif + #ifndef PCI_PRODUCT_LSI_SAS1064 #define PCI_PRODUCT_LSI_SAS1064 0x0050 #endif @@ -177,6 +197,10 @@ __FBSDID("$FreeBSD$"); #define PCI_PRODUCT_LSI_SAS1068 0x0054 #endif +#ifndef PCI_PRODUCT_LSI_SAS1068A +#define PCI_PRODUCT_LSI_SAS1068A 0x0055 +#endif + #ifndef PCI_PRODUCT_LSI_SAS1068E #define PCI_PRODUCT_LSI_SAS1068E 0x0058 #endif @@ -232,7 +256,7 @@ mpt_pci_probe(device_t dev) return (ENXIO); } - switch ((pci_get_device(dev) & ~1)) { + switch (pci_get_device(dev)) { case PCI_PRODUCT_LSI_FC909: desc = "LSILogic FC909 FC Adapter"; break; @@ -242,15 +266,27 @@ mpt_pci_probe(device_t dev) case PCI_PRODUCT_LSI_FC919: desc = "LSILogic FC919 FC Adapter"; break; + case PCI_PRODUCT_LSI_FC919_LAN: + desc = "LSILogic FC919 LAN Adapter"; + break; case PCI_PRODUCT_LSI_FC929: desc = "Dual LSILogic FC929 FC Adapter"; break; + case PCI_PRODUCT_LSI_FC929_LAN: + desc = "Dual LSILogic FC929 LAN Adapter"; + break; case PCI_PRODUCT_LSI_FC919X: desc = "LSILogic FC919 FC PCI-X Adapter"; break; + case PCI_PRODUCT_LSI_FC919X_LAN: + desc = "LSILogic FC919 LAN PCI-X Adapter"; + break; case PCI_PRODUCT_LSI_FC929X: desc = "Dual LSILogic FC929X 2Gb/s FC PCI-X Adapter"; break; + case PCI_PRODUCT_LSI_FC929X_LAN: + desc = "Dual LSILogic FC929X LAN PCI-X Adapter"; + break; case PCI_PRODUCT_LSI_FC646: desc = "Dual LSILogic FC7X04X 4Gb/s FC PCI-Express Adapter"; break; @@ -258,6 +294,7 @@ mpt_pci_probe(device_t dev) desc = "Dual LSILogic FC7X04X 4Gb/s FC PCI-X Adapter"; break; case PCI_PRODUCT_LSI_1030: + case PCI_PRODUCT_LSI_1030ZC: desc = "LSILogic 1030 Ultra4 Adapter"; break; case PCI_PRODUCT_LSI_SAS1064: @@ -266,6 +303,7 @@ mpt_pci_probe(device_t dev) case PCI_PRODUCT_LSI_SAS1066: case PCI_PRODUCT_LSI_SAS1066E: case PCI_PRODUCT_LSI_SAS1068: + case PCI_PRODUCT_LSI_SAS1068A: case PCI_PRODUCT_LSI_SAS1068E: case PCI_PRODUCT_LSI_SAS1078: case PCI_PRODUCT_LSI_SAS1078DE: @@ -428,12 +466,17 @@ mpt_pci_attach(device_t dev) return (ENOMEM); } memset(mpt, 0, sizeof(struct mpt_softc)); - switch ((pci_get_device(dev) & ~1)) { + switch (pci_get_device(dev)) { case PCI_PRODUCT_LSI_FC909: case PCI_PRODUCT_LSI_FC909A: case PCI_PRODUCT_LSI_FC919: + case PCI_PRODUCT_LSI_FC919_LAN: case PCI_PRODUCT_LSI_FC929: + case PCI_PRODUCT_LSI_FC929_LAN: + case PCI_PRODUCT_LSI_FC929X: + case PCI_PRODUCT_LSI_FC929X_LAN: case PCI_PRODUCT_LSI_FC919X: + case PCI_PRODUCT_LSI_FC919X_LAN: case PCI_PRODUCT_LSI_FC646: case PCI_PRODUCT_LSI_FC7X04X: mpt->is_fc = 1; @@ -448,6 +491,7 @@ mpt_pci_attach(device_t dev) case PCI_PRODUCT_LSI_SAS1066: case PCI_PRODUCT_LSI_SAS1066E: case PCI_PRODUCT_LSI_SAS1068: + case PCI_PRODUCT_LSI_SAS1068A: case PCI_PRODUCT_LSI_SAS1068E: mpt->is_sas = 1; break; @@ -499,11 +543,17 @@ mpt_pci_attach(device_t dev) * Is this part a dual? * If so, link with our partner (around yet) */ - if ((pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC929 || - (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC646 || - (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC7X04X || - (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_1030) { + switch (pci_get_device(dev)) { + case PCI_PRODUCT_LSI_FC929: + case PCI_PRODUCT_LSI_FC929_LAN: + case PCI_PRODUCT_LSI_FC646: + case PCI_PRODUCT_LSI_FC7X04X: + case PCI_PRODUCT_LSI_1030: + case PCI_PRODUCT_LSI_1030ZC: mpt_link_peer(mpt); + break; + default: + break; } /* From owner-svn-src-stable-7@FreeBSD.ORG Wed Mar 7 08:21:25 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC81B106566B; Wed, 7 Mar 2012 08:21:25 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B80FA8FC08; Wed, 7 Mar 2012 08:21:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q278LPJQ082903; Wed, 7 Mar 2012 08:21:25 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q278LPK5082901; Wed, 7 Mar 2012 08:21:25 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201203070821.q278LPK5082901@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 7 Mar 2012 08:21:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232649 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 08:21:25 -0000 Author: pluknet Date: Wed Mar 7 08:21:25 2012 New Revision: 232649 URL: http://svn.freebsd.org/changeset/base/232649 Log: MFC r231821: delete-old does not have delete-old-libs dependency. Reflect this in the comment. PR: conf/163993 Submitted by: Eugen Konkov Modified: stable/7/Makefile (contents, props changed) Modified: stable/7/Makefile ============================================================================== --- stable/7/Makefile Wed Mar 7 08:10:55 2012 (r232648) +++ stable/7/Makefile Wed Mar 7 08:21:25 2012 (r232649) @@ -21,7 +21,7 @@ # check-old-dirs - List obsolete directories. # check-old-files - List obsolete files. # check-old-libs - List obsolete libraries. -# delete-old - Delete obsolete directories/files/libraries. +# delete-old - Delete obsolete directories/files. # delete-old-dirs - Delete obsolete directories. # delete-old-files - Delete obsolete files. # delete-old-libs - Delete obsolete libraries. From owner-svn-src-stable-7@FreeBSD.ORG Wed Mar 7 22:19:44 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A53D01065673; Wed, 7 Mar 2012 22:19:44 +0000 (UTC) (envelope-from mp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9081A8FC0C; Wed, 7 Mar 2012 22:19:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q27MJipK012903; Wed, 7 Mar 2012 22:19:44 GMT (envelope-from mp@svn.freebsd.org) Received: (from mp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q27MJihI012890; Wed, 7 Mar 2012 22:19:44 GMT (envelope-from mp@svn.freebsd.org) Message-Id: <201203072219.q27MJihI012890@svn.freebsd.org> From: Mark Peek Date: Wed, 7 Mar 2012 22:19:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232674 - in stable/7: bin/csh contrib/tcsh contrib/tcsh/config contrib/tcsh/nls contrib/tcsh/nls/C contrib/tcsh/nls/et contrib/tcsh/nls/finnish contrib/tcsh/nls/french contrib/tcsh/nls... X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 22:19:44 -0000 Author: mp Date: Wed Mar 7 22:19:43 2012 New Revision: 232674 URL: http://svn.freebsd.org/changeset/base/232674 Log: MFC r231990 Update to tcsh 6.18.01 Added: stable/7/contrib/tcsh/nls/Makefile.in - copied unchanged from r231990, head/contrib/tcsh/nls/Makefile.in stable/7/contrib/tcsh/nls/catgen - copied unchanged from r231990, head/contrib/tcsh/nls/catgen stable/7/contrib/tcsh/svn - copied unchanged from r231990, head/contrib/tcsh/svn Deleted: stable/7/bin/csh/host.defs stable/7/contrib/tcsh/nls/Makefile Modified: stable/7/bin/csh/Makefile stable/7/bin/csh/config.h stable/7/bin/csh/config_p.h stable/7/contrib/tcsh/Fixes stable/7/contrib/tcsh/Imakefile stable/7/contrib/tcsh/Makefile.in stable/7/contrib/tcsh/Ported stable/7/contrib/tcsh/README stable/7/contrib/tcsh/WishList stable/7/contrib/tcsh/complete.tcsh stable/7/contrib/tcsh/config.guess stable/7/contrib/tcsh/config.h.in stable/7/contrib/tcsh/config.sub stable/7/contrib/tcsh/config/bsd4.4 stable/7/contrib/tcsh/config_f.h stable/7/contrib/tcsh/configure stable/7/contrib/tcsh/configure.in stable/7/contrib/tcsh/ed.chared.c stable/7/contrib/tcsh/ed.inputl.c stable/7/contrib/tcsh/ed.refresh.c stable/7/contrib/tcsh/ed.screen.c stable/7/contrib/tcsh/ed.term.c stable/7/contrib/tcsh/gethost.c stable/7/contrib/tcsh/glob.c stable/7/contrib/tcsh/glob.h stable/7/contrib/tcsh/host.defs stable/7/contrib/tcsh/install-sh stable/7/contrib/tcsh/nls/C/charset stable/7/contrib/tcsh/nls/C/set19 stable/7/contrib/tcsh/nls/et/charset stable/7/contrib/tcsh/nls/et/set1 stable/7/contrib/tcsh/nls/et/set10 stable/7/contrib/tcsh/nls/et/set11 stable/7/contrib/tcsh/nls/et/set13 stable/7/contrib/tcsh/nls/et/set14 stable/7/contrib/tcsh/nls/et/set15 stable/7/contrib/tcsh/nls/et/set16 stable/7/contrib/tcsh/nls/et/set17 stable/7/contrib/tcsh/nls/et/set18 stable/7/contrib/tcsh/nls/et/set19 stable/7/contrib/tcsh/nls/et/set2 stable/7/contrib/tcsh/nls/et/set20 stable/7/contrib/tcsh/nls/et/set21 stable/7/contrib/tcsh/nls/et/set22 stable/7/contrib/tcsh/nls/et/set23 stable/7/contrib/tcsh/nls/et/set24 stable/7/contrib/tcsh/nls/et/set25 stable/7/contrib/tcsh/nls/et/set26 stable/7/contrib/tcsh/nls/et/set27 stable/7/contrib/tcsh/nls/et/set3 stable/7/contrib/tcsh/nls/et/set30 stable/7/contrib/tcsh/nls/et/set4 stable/7/contrib/tcsh/nls/et/set5 stable/7/contrib/tcsh/nls/et/set6 stable/7/contrib/tcsh/nls/et/set7 stable/7/contrib/tcsh/nls/et/set8 stable/7/contrib/tcsh/nls/et/set9 stable/7/contrib/tcsh/nls/finnish/charset stable/7/contrib/tcsh/nls/finnish/set1 stable/7/contrib/tcsh/nls/finnish/set10 stable/7/contrib/tcsh/nls/finnish/set11 stable/7/contrib/tcsh/nls/finnish/set12 stable/7/contrib/tcsh/nls/finnish/set13 stable/7/contrib/tcsh/nls/finnish/set14 stable/7/contrib/tcsh/nls/finnish/set16 stable/7/contrib/tcsh/nls/finnish/set17 stable/7/contrib/tcsh/nls/finnish/set18 stable/7/contrib/tcsh/nls/finnish/set19 stable/7/contrib/tcsh/nls/finnish/set2 stable/7/contrib/tcsh/nls/finnish/set20 stable/7/contrib/tcsh/nls/finnish/set22 stable/7/contrib/tcsh/nls/finnish/set23 stable/7/contrib/tcsh/nls/finnish/set25 stable/7/contrib/tcsh/nls/finnish/set26 stable/7/contrib/tcsh/nls/finnish/set27 stable/7/contrib/tcsh/nls/finnish/set29 stable/7/contrib/tcsh/nls/finnish/set3 stable/7/contrib/tcsh/nls/finnish/set6 stable/7/contrib/tcsh/nls/finnish/set7 stable/7/contrib/tcsh/nls/finnish/set9 stable/7/contrib/tcsh/nls/french/charset stable/7/contrib/tcsh/nls/french/set1 stable/7/contrib/tcsh/nls/french/set10 stable/7/contrib/tcsh/nls/french/set11 stable/7/contrib/tcsh/nls/french/set12 stable/7/contrib/tcsh/nls/french/set13 stable/7/contrib/tcsh/nls/french/set15 stable/7/contrib/tcsh/nls/french/set16 stable/7/contrib/tcsh/nls/french/set17 stable/7/contrib/tcsh/nls/french/set18 stable/7/contrib/tcsh/nls/french/set19 stable/7/contrib/tcsh/nls/french/set2 stable/7/contrib/tcsh/nls/french/set20 stable/7/contrib/tcsh/nls/french/set21 stable/7/contrib/tcsh/nls/french/set22 stable/7/contrib/tcsh/nls/french/set23 stable/7/contrib/tcsh/nls/french/set25 stable/7/contrib/tcsh/nls/french/set26 stable/7/contrib/tcsh/nls/french/set27 stable/7/contrib/tcsh/nls/french/set3 stable/7/contrib/tcsh/nls/french/set30 stable/7/contrib/tcsh/nls/french/set31 stable/7/contrib/tcsh/nls/french/set4 stable/7/contrib/tcsh/nls/french/set6 stable/7/contrib/tcsh/nls/french/set7 stable/7/contrib/tcsh/nls/french/set8 stable/7/contrib/tcsh/nls/french/set9 stable/7/contrib/tcsh/nls/german/charset stable/7/contrib/tcsh/nls/german/set1 stable/7/contrib/tcsh/nls/german/set10 stable/7/contrib/tcsh/nls/german/set13 stable/7/contrib/tcsh/nls/german/set15 stable/7/contrib/tcsh/nls/german/set16 stable/7/contrib/tcsh/nls/german/set17 stable/7/contrib/tcsh/nls/german/set18 stable/7/contrib/tcsh/nls/german/set19 stable/7/contrib/tcsh/nls/german/set2 stable/7/contrib/tcsh/nls/german/set20 stable/7/contrib/tcsh/nls/german/set22 stable/7/contrib/tcsh/nls/german/set23 stable/7/contrib/tcsh/nls/german/set25 stable/7/contrib/tcsh/nls/german/set26 stable/7/contrib/tcsh/nls/german/set27 stable/7/contrib/tcsh/nls/german/set29 stable/7/contrib/tcsh/nls/german/set3 stable/7/contrib/tcsh/nls/german/set30 stable/7/contrib/tcsh/nls/german/set31 stable/7/contrib/tcsh/nls/german/set4 stable/7/contrib/tcsh/nls/german/set5 stable/7/contrib/tcsh/nls/german/set6 stable/7/contrib/tcsh/nls/german/set7 stable/7/contrib/tcsh/nls/german/set8 stable/7/contrib/tcsh/nls/german/set9 stable/7/contrib/tcsh/nls/greek/charset stable/7/contrib/tcsh/nls/greek/set1 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set10 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set11 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set12 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set13 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set14 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set15 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set16 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set17 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set18 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set19 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set2 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set20 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set21 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set22 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set23 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set25 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set26 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set27 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set29 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set3 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set30 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set31 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set4 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set5 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set6 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set7 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set8 (contents, props changed) stable/7/contrib/tcsh/nls/greek/set9 (contents, props changed) stable/7/contrib/tcsh/nls/italian/charset stable/7/contrib/tcsh/nls/italian/set1 stable/7/contrib/tcsh/nls/italian/set11 stable/7/contrib/tcsh/nls/italian/set13 stable/7/contrib/tcsh/nls/italian/set15 stable/7/contrib/tcsh/nls/italian/set17 stable/7/contrib/tcsh/nls/italian/set19 stable/7/contrib/tcsh/nls/italian/set2 stable/7/contrib/tcsh/nls/italian/set20 stable/7/contrib/tcsh/nls/italian/set22 stable/7/contrib/tcsh/nls/italian/set23 stable/7/contrib/tcsh/nls/italian/set26 stable/7/contrib/tcsh/nls/italian/set3 stable/7/contrib/tcsh/nls/italian/set30 stable/7/contrib/tcsh/nls/italian/set4 stable/7/contrib/tcsh/nls/italian/set6 stable/7/contrib/tcsh/nls/italian/set7 stable/7/contrib/tcsh/nls/ja/charset stable/7/contrib/tcsh/nls/ja/set1 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set10 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set11 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set12 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set13 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set15 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set16 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set17 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set18 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set2 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set21 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set29 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set3 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set30 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set4 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set5 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set6 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set7 (contents, props changed) stable/7/contrib/tcsh/nls/ja/set8 (contents, props changed) stable/7/contrib/tcsh/nls/russian/charset stable/7/contrib/tcsh/nls/russian/set1 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set10 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set11 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set12 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set13 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set14 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set15 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set16 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set17 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set18 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set19 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set2 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set20 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set22 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set23 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set25 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set26 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set27 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set29 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set30 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set31 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set4 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set5 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set6 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set7 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set8 (contents, props changed) stable/7/contrib/tcsh/nls/russian/set9 (contents, props changed) stable/7/contrib/tcsh/nls/spanish/charset stable/7/contrib/tcsh/nls/spanish/set1 stable/7/contrib/tcsh/nls/spanish/set10 stable/7/contrib/tcsh/nls/spanish/set13 stable/7/contrib/tcsh/nls/spanish/set14 stable/7/contrib/tcsh/nls/spanish/set15 stable/7/contrib/tcsh/nls/spanish/set16 stable/7/contrib/tcsh/nls/spanish/set17 stable/7/contrib/tcsh/nls/spanish/set18 stable/7/contrib/tcsh/nls/spanish/set19 stable/7/contrib/tcsh/nls/spanish/set2 stable/7/contrib/tcsh/nls/spanish/set20 stable/7/contrib/tcsh/nls/spanish/set22 stable/7/contrib/tcsh/nls/spanish/set23 stable/7/contrib/tcsh/nls/spanish/set25 stable/7/contrib/tcsh/nls/spanish/set26 stable/7/contrib/tcsh/nls/spanish/set27 stable/7/contrib/tcsh/nls/spanish/set3 stable/7/contrib/tcsh/nls/spanish/set30 stable/7/contrib/tcsh/nls/spanish/set4 stable/7/contrib/tcsh/nls/spanish/set5 stable/7/contrib/tcsh/nls/spanish/set6 stable/7/contrib/tcsh/nls/spanish/set7 stable/7/contrib/tcsh/nls/spanish/set8 stable/7/contrib/tcsh/nls/spanish/set9 stable/7/contrib/tcsh/nls/ukrainian/charset stable/7/contrib/tcsh/nls/ukrainian/set1 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set10 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set11 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set12 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set13 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set14 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set15 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set16 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set17 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set18 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set19 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set2 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set20 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set22 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set23 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set25 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set26 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set27 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set29 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set30 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set31 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set5 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set6 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set7 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set8 (contents, props changed) stable/7/contrib/tcsh/nls/ukrainian/set9 (contents, props changed) stable/7/contrib/tcsh/patchlevel.h stable/7/contrib/tcsh/pathnames.h stable/7/contrib/tcsh/sh.c stable/7/contrib/tcsh/sh.char.c stable/7/contrib/tcsh/sh.char.h stable/7/contrib/tcsh/sh.decls.h stable/7/contrib/tcsh/sh.dir.c stable/7/contrib/tcsh/sh.dol.c stable/7/contrib/tcsh/sh.err.c stable/7/contrib/tcsh/sh.exec.c stable/7/contrib/tcsh/sh.exp.c stable/7/contrib/tcsh/sh.file.c stable/7/contrib/tcsh/sh.func.c stable/7/contrib/tcsh/sh.glob.c stable/7/contrib/tcsh/sh.h stable/7/contrib/tcsh/sh.hist.c stable/7/contrib/tcsh/sh.lex.c stable/7/contrib/tcsh/sh.misc.c stable/7/contrib/tcsh/sh.parse.c stable/7/contrib/tcsh/sh.print.c stable/7/contrib/tcsh/sh.proc.c stable/7/contrib/tcsh/sh.proc.h stable/7/contrib/tcsh/sh.sem.c stable/7/contrib/tcsh/sh.set.c stable/7/contrib/tcsh/sh.time.c stable/7/contrib/tcsh/tc.alloc.c stable/7/contrib/tcsh/tc.const.c stable/7/contrib/tcsh/tc.decls.h stable/7/contrib/tcsh/tc.disc.c stable/7/contrib/tcsh/tc.func.c stable/7/contrib/tcsh/tc.nls.c stable/7/contrib/tcsh/tc.nls.h stable/7/contrib/tcsh/tc.os.c stable/7/contrib/tcsh/tc.os.h stable/7/contrib/tcsh/tc.prompt.c stable/7/contrib/tcsh/tc.sig.c stable/7/contrib/tcsh/tc.sig.h stable/7/contrib/tcsh/tc.str.c stable/7/contrib/tcsh/tc.wait.h stable/7/contrib/tcsh/tc.who.c stable/7/contrib/tcsh/tcsh.man stable/7/contrib/tcsh/tcsh.man2html stable/7/contrib/tcsh/tw.color.c stable/7/contrib/tcsh/tw.init.c stable/7/contrib/tcsh/tw.parse.c stable/7/contrib/tcsh/vms.termcap.c Directory Properties: stable/7/bin/csh/ (props changed) stable/7/contrib/tcsh/ (props changed) stable/7/contrib/tcsh/nls/greek/set24 (props changed) stable/7/contrib/tcsh/nls/ja/set24 (props changed) stable/7/contrib/tcsh/nls/russian/set21 (props changed) stable/7/contrib/tcsh/nls/russian/set24 (props changed) stable/7/contrib/tcsh/nls/russian/set3 (props changed) stable/7/contrib/tcsh/nls/ukrainian/set21 (props changed) stable/7/contrib/tcsh/nls/ukrainian/set24 (props changed) stable/7/contrib/tcsh/nls/ukrainian/set3 (props changed) stable/7/contrib/tcsh/nls/ukrainian/set4 (props changed) Modified: stable/7/bin/csh/Makefile ============================================================================== --- stable/7/bin/csh/Makefile Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/bin/csh/Makefile Wed Mar 7 22:19:43 2012 (r232674) @@ -18,7 +18,7 @@ DFLAGS= -D_PATH_TCSHELL='"/rescue/${PROG DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' .endif CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} -WARNS?= 0 +WARNS?= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ @@ -107,10 +107,10 @@ gethost: gethost.c sh.err.h tc.const.h s @rm -f ${.TARGET} ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${TCSHDIR}/gethost.c -tc.defs.c: gethost ${.CURDIR}/host.defs +tc.defs.c: gethost ${TCSHDIR}/host.defs @rm -f ${.TARGET} @echo "/* Do not edit this file, make creates it */" > ${.TARGET} - ./gethost ${.CURDIR}/host.defs >> ${.TARGET} + ./gethost ${TCSHDIR}/host.defs >> ${.TARGET} ed.defns.h: ed.defns.c @rm -f ${.TARGET} Modified: stable/7/bin/csh/config.h ============================================================================== --- stable/7/bin/csh/config.h Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/bin/csh/config.h Wed Mar 7 22:19:43 2012 (r232674) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* Define to the type of elements in the array set by `getgroups'. Usually @@ -12,9 +12,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_AUTH_H */ -/* Define to 1 if you have the `catgets' function. */ -#define HAVE_CATGETS 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_CRYPT_H */ @@ -41,6 +38,9 @@ /* Define to 1 if you have the `dup2' function. */ #define HAVE_DUP2 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FEATURES_H */ + /* Define to 1 if you have the `getauthid' function. */ /* #undef HAVE_GETAUTHID */ @@ -56,7 +56,10 @@ /* Define to 1 if you have the `getutent' function. */ /* #undef HAVE_GETUTENT */ -/* Define if you have the iconv() function. */ +/* Define to 1 if you have the `getutxent' function. */ +/* #undef HAVE_GETUTXENT */ + +/* Define if you have the iconv() function and it works. */ /* #undef HAVE_ICONV */ /* Define to 1 if you have the header file. */ @@ -65,6 +68,9 @@ /* Define to 1 if the system has the type `long long'. */ #define HAVE_LONG_LONG 1 +/* Define to 1 if you have the `mallinfo' function. */ +/* #undef HAVE_MALLINFO */ + /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -77,6 +83,9 @@ /* Define to 1 if you have the `memset' function. */ #define HAVE_MEMSET 1 +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ @@ -86,6 +95,9 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + /* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 @@ -120,22 +132,34 @@ /* Define to 1 if you have the `strstr' function. */ #define HAVE_STRSTR 1 -/* Define to 1 if `d_ino' is member of `struct dirent'. */ +/* Define to 1 if `d_ino' is a member of `struct dirent'. */ #define HAVE_STRUCT_DIRENT_D_INO 1 -/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */ +/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 -/* Define to 1 if `ut_host' is member of `struct utmp'. */ +/* Define to 1 if `ut_host' is a member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_HOST */ + +/* Define to 1 if `ut_tv' is a member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_TV */ + +/* Define to 1 if `ut_user' is a member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_USER */ + +/* Define to 1 if `ut_xtime' is a member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_XTIME */ + +/* Define to 1 if `ut_host' is a member of `struct utmp'. */ #define HAVE_STRUCT_UTMP_UT_HOST 1 -/* Define to 1 if `ut_tv' is member of `struct utmp'. */ +/* Define to 1 if `ut_tv' is a member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_TV */ -/* Define to 1 if `ut_user' is member of `struct utmp'. */ +/* Define to 1 if `ut_user' is a member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_USER */ -/* Define to 1 if `ut_xtime' is member of `struct utmp'. */ +/* Define to 1 if `ut_xtime' is a member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ /* Define to 1 if you have the `sysconf' function. */ @@ -179,25 +203,31 @@ /* Support NLS. */ #define NLS 1 +/* Support NLS catalogs. */ +#define NLS_CATALOGS 1 + /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +#define PACKAGE_BUGREPORT "http://bugs.gw.com/" /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +#define PACKAGE_NAME "tcsh" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +#define PACKAGE_STRING "tcsh 6.18.01" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +#define PACKAGE_TARNAME "tcsh" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "" +#define PACKAGE_VERSION "6.18.01" /* Define to 1 if the `setpgrp' function takes no argument. */ /* #undef SETPGRP_VOID */ -/* The size of a `wchar_t', as computed by sizeof. */ +/* The size of `wchar_t', as computed by sizeof. */ #define SIZEOF_WCHAR_T 4 /* Define to 1 if the `S_IS*' macros in do not work properly. */ @@ -206,6 +236,11 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -215,7 +250,7 @@ /* Define to `int' if does not define. */ /* #undef mode_t */ -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ /* #undef size_t */ /* Define to `int' if neither nor define. */ @@ -227,6 +262,10 @@ /* Define to `int' if doesn't define. */ /* #undef uid_t */ +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + /* Define to empty if the keyword `volatile' does not work. Warning: valid code using `volatile' can become incorrect without. Disable with care. */ /* #undef volatile */ @@ -234,9 +273,5 @@ #include "config_p.h" #include "config_f.h" -#ifndef NO_NLS_CATALOGS -#define NLS_CATALOGS -#endif - /* Work around a vendor issue where config_f.h is #undef'ing this setting */ #define SYSMALLOC Modified: stable/7/bin/csh/config_p.h ============================================================================== --- stable/7/bin/csh/config_p.h Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/bin/csh/config_p.h Wed Mar 7 22:19:43 2012 (r232674) @@ -105,9 +105,6 @@ #elif defined(__APPLE__) # define SYSMALLOC - -#else -# define NLS_CATALOGS #endif #endif /* _h_config */ Modified: stable/7/contrib/tcsh/Fixes ============================================================================== --- stable/7/contrib/tcsh/Fixes Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/Fixes Wed Mar 7 22:19:43 2012 (r232674) @@ -1,3 +1,147 @@ + 6. V6.18.01 - 20120214 + 5. fix interruptible wait again + 4. ignore bogus compiler overflow message + 3. cleanup ifdefs in utmp code, and provide default array entries + 2. Ignore #machine entries in host.defs + 1. Detect missing ) in gethost.c (Corinna Vinschen) + +104. V6.18.00 - 20120114 +103. remove unused variables. +102. Make gethost use definitions for x __x__ and __x automatically. +101. More utmp fixes +100. V6.17.10 - 20120105 + 99. Add more FreeBSD/NetBSD machines + 98. Add portability wrapper for gencat + 97. Fix warning for write in SYSMALLOC systems. + 96. V6.17.09 - 20120102 + 95. revert gencat handling to pre-cygwin fixes (without the env settings) + 94. remove stray endutent() + 93. V6.17.08 - 20111230 + 92. Remove - from gencat + 91. Provide support for malloc_usable_size() so that linux works again + without SYSMALLOC + 90. Add support for FreeBSD's utmpx. + 89. V6.17.07 - 20111227 + 88. Fix debian bug #645238: tcsh segfaults when prompt includes %j and + there are more than 10 jobs. + 87. PR/155: Default $anyerror to set for backward compatibility + 86. PR/149: Don't print -1 in %j (Vojtech Vitek) + 85. handle -- on chdir commands as the end of options processing so that + they can process a directory like -x without resorting to ./-x + (Andrew Stevenson) + 84. Handle write(2) returning ENOENT from SoFS, thanks ++HAL (Robert Byrnes) + 83. PR/38: Null check for jobs (Kurt Miller) + 82. Fix spelling correction correcting ./foo -> ../foo2 (jean-luc leger) + 81. PR/120: string0 in filetest does not have enough space. + 80. V6.17.06 - 20110415 + 79. PR/110: Add $anyerror to select behavior. Default to the new one. + 78. Don't try to spell commands that are correct (Rouben Rostamian) + [./tcsh -f; set path=($path 2); mkdir foo2; cd foo2; touch foo; + chmod +x foo; set correct=cmd; ./foo -> ../foo] + 77. Don't push the syntax struct on the cleanup stack, because on foo;bar + if foo fails, we will free bar prematurely (Ben Miller) + 76. Avoid infinite loop while trying to print the pid of a dying process + to a closed file (Bob Arendt) + 75. Handle completion of ${ variables (Anthony Mallet) + 74. Add --disable-nls-catalogs (Corinna Vinschen) + 73. convert message catalogs to UTF-8 (Werner Fink) + 72. check that the NLS path works before setting $NLSPATH. + 71. use SYSMALLOC for GLIBC (Werner Fink) + 70. use mallinfo for SYSMALLOC (Corinna Vinschen) + 69. V6.17.05 - 20110201 + 68. Use mkstemp() if there for here docs (Werner Fink) + 67. Fix handling of errors and exit values in builtins (Werner Fink) + 66. Better pty name detection (Werner Fink) + 65. Enable NLS catalogs on Cygwin (Corinna Vinschen) + 64. NLSPATH handling fixes (Corinna Vinschen) + 63. Avoid infrequent exit when tcsh cd's into a non-existent directory + https://bugzilla.novell.com/show_bug.cgi?id=293395 (Werner Fink) + 62. Don't try to spell check full path binaries that are correct because + they can cause hangs when other nfs partitions are hung. (Werner Fink) + 61. Avoid nested interrupts when exiting causing history writing to fail + https://bugzilla.novell.com/show_bug.cgi?id=331627 (Werner Fink) + 60. Instead of giving an error or ignoring lines with missing eol at eof, + process them. + 59. Avoid leaking fd's in mail check (Werner Fink) + 58. Add cygwin_xcrypt() (Corinna Vinschen) + 57. Recognize i686 (Corinna Vinschen) + 56. Rename cygwin32 to cygwin and bring it up-to-date with modern cygwin + settings (Corinna Vinschen) + 55. Avoid double slashes in cdpath (Corinna Vinschen) + 54. V6.17.04 - 20110118 + 53. Revert PR/110, breaks the test suite. + 52. V6.17.03 - 20110117 + 51. PR/102: Complain on input files with missing trailing \n + 50. PR/104: If atime == mtime we don't have new mail. + 49. PR/113: Don't allow illegal variable names to be set. + 48. PR/112: don't set $REMOTEHOST on the local machine. + 47. PR/110: exit status of the pipeline should be the status of the last + command. + 46. Android support (Corinna Vinschen) + 45. Add AUTOSET_KANJI which works around the Shift-JIS encoding that + translates unshifted 7 bit ASCII (Werner Fink) + 44. Handle mb{r,}towc() returning 0 by setting the return value to NUL + (Jean-Luc Leger) + 43. PR/109: make wait interruptible (Vojtech Vitek) + 42. resource limit fixes: signed vs. unsigned, megabyte issue, doc issues + (Robert Byrnes) + 41. remove .bat and .cmd handling for executables on cygwin (Corinna Vinschen) + 40. Don't echo history while history -L or history -M + 39. Check for EOS before ** from Greg Dionne + 38. Don't fork in backeval from Bryan Mason + 37. Better globstar support from Greg Dionne + 36. Error out when processing the last incomplete line instead of silently + ignoring it (Anders Kaseorg) + 35. Fix SEGV from echo `` + 34. Better fixes for histchars and promptchars (nargs) + 33. Fix win32 issue calling fmalloc/ffree from non-thread-safe context. + (Fabio Fabbri) + 32. V6.17.02 - 20100512 + 31. PR/79: nargs: Better handling for promptchars. + 30. PR/97: Add parseoctal to retain compatibility with previous versions (Jim + Zajkowski) + 29. PR/84: Performance fixes for large history merges (add + hashtable (Ted Anderson) + 28. Revert previous #23; people should use $histlit if they want this + feature. + 27. Don't kill "hup" background jobs when a child of the shell exits. + From Debian. + 26. Ignore \r\n in the command line options for OS's that don't strip + these from #!; from Debian + 25. Fix enhanced missing patch (Greg Dionne) + 24. Callers of rt_mbtowc don't grok -2 as a return. Return -1 for now. + (Corinna Vinschen) + 23. Turn HistLit on while recording history to avoid \!\! losing its \. + From Debian + 22. set autoexpand; set histchars="";\n crash. From Debian + 21. V6.17.01 - 20100506 + 20. unset verbose while we are reading the history file to avoid echoing + to the terminal. (Jeffrey Bastian) + 19. globstar addition, Enhance addition, euid, euser, gid variables + (Greg Dionne) + 18. Make 'e' in vi mode work like 'b' - use wordchars (Alistair Crooks) + 17. Handle UTF-16 surrogates (Corinna Vinschen) + 16. Make tcsh work on systems where sizeof(wchar_t) == 2 (Corinna Vinschen) + 15. Better support for Solaris >= 2.9 (Thomas Uhle) + 14. Change internal expression calculations to long long so that we can + deal with > 32 bit time, inodes, uids, file sizes etc. + 13. Add new linux resource limits. + 12. Don't print 'Exit X' when printexitvalue is set in `` expressions + (Jeff Bastian) + 11. Add more LS_COLORS vars (M.H. Anderson) + 10. Reduce whitespace in Makefile (Don Estabrook) + 9. Manual page fixes (Alan R. S. Bueno) + 8. Remove history in loops bug from the documentation (Holger Weiss) + 7. Add autorehash (Holger Weiss) + 6. Add history.at (Ted Anderson) + 5. Better NLSPATH handling (Norm Jacobs) + 4. Fix hostname building from utmp (Cyrus Rahman) + 3. Handle pending signals before flush so that the the history file does + not get truncated. (Ted Anderson) + 2. Fix AsciiOnly setting that broke 8 bit input. (Juergen Keil) + 1. remember to closedir in mailchk (from Werner Fink, reported by + David Binderman) + 21. V6.17.00 - 20090710 20. Fix dataroot autoconf issue. 19. Fix directory stuff for unit tests. Modified: stable/7/contrib/tcsh/Imakefile ============================================================================== --- stable/7/contrib/tcsh/Imakefile Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/Imakefile Wed Mar 7 22:19:43 2012 (r232674) @@ -1,5 +1,5 @@ XCOMM -XCOMM $tcsh: Imakefile,v 1.86 2007/03/19 23:25:02 christos Exp $ +XCOMM $tcsh: Imakefile,v 1.87 2010/01/28 19:01:05 christos Exp $ XCOMM XCOMM Imakefile for tcsh 6.12 XCOMM Marc Horowitz, MIT SIPB @@ -93,7 +93,11 @@ ones. Please send in your fixes and add # if (OSMinorVersion < 6) # define ConfigH sol24 # else -# define ConfigH sol26 +# if (OSMinorVersion < 9) +# define ConfigH sol26 +# else +# define ConfigH sol29 +# endif # endif # endif # endif Modified: stable/7/contrib/tcsh/Makefile.in ============================================================================== --- stable/7/contrib/tcsh/Makefile.in Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/Makefile.in Wed Mar 7 22:19:43 2012 (r232674) @@ -1,4 +1,4 @@ -# $tcsh: Makefile.in,v 3.40 2009/06/24 22:09:05 christos Exp $ +# $tcsh: Makefile.in,v 3.49 2011/02/05 17:35:31 christos Exp $ # Makefile.in 4.3 6/11/83 # # C Shell with process control; VM/UNIX VAX Makefile @@ -26,22 +26,27 @@ CF=-c CPPFLAGS=-I. -I$(srcdir) LFLAGS= -#LFLAGS= -Zn10000 # hpux lint +# hpux lint +#LFLAGS= -Zn10000 -CFLAGS = @CFLAGS@ # This is set by autoconf. -#CFLAGS= -g # debug -#CFLAGS= -O # production -#CFLAGS= # Broken optimizers.... +# This is set by autoconf: +CFLAGS = @CFLAGS@ +# debug: +#CFLAGS= -g +# production: +#CFLAGS= -O +# Broken optimizers.... +#CFLAGS= #CFLAGS= -g -pg -DPROF #CFLAGS= -O -pg -DPROF # gcc 1.00-1.37 -#CFLAGS= -O -finline-functions -fstrength-reduce +#CFLAGS= -O -finline-functions -fstrength-reduce # gcc 1.37-1.40 -#CFLAGS= -O -fcombine-regs -finline-functions -fstrength-reduce +#CFLAGS= -O -fcombine-regs -finline-functions -fstrength-reduce # add -msoft-float for 68881 machines. # gcc 2.0 @@ -67,8 +72,10 @@ CFLAGS = @CFLAGS@ # This is set by auto #CFLAGS= -O -Mnodebug -Mnoperfmon # DEC Alpha OSF/1 -#CFLAGS= -O2 -Olimit 2000 ## Normal Optimization -#CFLAGS= -O3 -Olimit 2000 ## Full Optimization - may not work +## Normal Optimization +#CFLAGS= -O2 -Olimit 2000 +## Full Optimization - may not work +#CFLAGS= -O3 -Olimit 2000 #CF=-j #SUF=u #.SUFFIXES: .u @@ -77,7 +84,8 @@ CFLAGS = @CFLAGS@ # This is set by auto # global optimizer! (-O3). # On SGI 4.0+ you need to add -D__STDC__ too. #CFLAGS= -O3 -#CFLAGS= -O3 -Olimit 2000 ## Ultrix 4.2a +## Ultrix 4.2a +#CFLAGS= -O3 -Olimit 2000 #CF=-j #SUF=u #.SUFFIXES: .u ## Ultrix and gnu-make need that @@ -110,14 +118,14 @@ CFLAGS = @CFLAGS@ # This is set by auto # CFLAGS= -O3 # SINIX RMx00 -#CFLAGS= -O # -D_POSIX_SOURCE # -kansi +#CFLAGS= -O# -D_POSIX_SOURCE# -kansi # Apollo's with cc [apollo builtins don't work with gcc] # and apollo should not define __STDC__ if it does not have # the standard header files. RT's (aos4.3) need that too; # you might want to skip the -O on the rt's... Not very wise. # AIX/ESA needs -D_IBMESA on command line (this may disappear by GA) -#DFLAGS=-U__STDC__ +#DFLAGS=-U__STDC__ #DFLAGS=-D_IBMESA # On aix2.2.1 we need more compiler space. #DFLAGS=-Nd4000 -Nn3000 @@ -142,17 +150,25 @@ DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcs ################################################################ ## LDFLAGS. Define something here if you need to ################################################################ -LDFLAGS= @LDFLAGS@ ## This is set by autoconf. -#LDFLAGS= ## The simplest, suitable for all. -#LDFLAGS= -s ## Stripped. Takes less space on disk. -#LDFLAGS= -s -n ## Pure executable. Spares paging over -# ## the network for machines with local -# ## swap but external /usr/local/bin . -#LDFLAGS= -s -n -Bstatic ## Without dynamic linking. (SunOS/cc) -#LDFLAGS= -s -n -static ## Without dynamic linking. (SunOS/gcc) -#LDFLAGS= -Wl,-s,-n ## Stripped, shared text (Unicos) -#LDFLAGS= -s -static ## Link statically. (linux) -#LDFLAGS= -s -N ## Impure executable (linux) +## This is set by autoconf: +LDFLAGS= @LDFLAGS@ +## The simplest, suitable for all. +#LDFLAGS= +## Stripped. Takes less space on disk. +#LDFLAGS= -s +## Pure executable. Spares paging over the network for machines with +## local swap but external /usr/local/bin . +#LDFLAGS= -s -n +## Without dynamic linking. (SunOS/cc) +#LDFLAGS= -s -n -Bstatic +## Without dynamic linking. (SunOS/gcc) +#LDFLAGS= -s -n -static +## Stripped, shared text (Unicos) +#LDFLAGS= -Wl,-s,-n +## Link statically. (linux) +#LDFLAGS= -s -static +## Impure executable (linux) +#LDFLAGS= -s -N ################################################################ ## SBINLDFLAGS. Flags to build a tcsh suitable for installation in @@ -164,53 +180,100 @@ SBINLDFLAGS=-Wl,-R/etc/lib,-I/etc/lib/ld ################################################################ ## LIBES. Pick one, or roll your own. ################################################################ -LIBES= @LIBS@ ## This is set by autoconf. -#LIBES= -ltermcap ## BSD style things -#LIBES= -ltermcap ## SunOS, HP-UX, pyramid -#LIBES= -ltermcap ## Linux -#LIBES= -ltermcap -lshadow ## Linux with PW_SHADOW -#LIBES= -ltermcap -lsec ## Tek XD88/10 (UTekV) with PW_SHADOW -#LIBES= -ltermcap -lsec ## Motorola MPC (sysV88) with PW_SHADOW -#LIBES= -ltermcap -lcs ## Mach -#LIBES= -ltermcap -lbsd ## DEC osf1 on the alpha -#LIBES= -ltermcap -lbsd ## Intel paragon -#LIBES= -ltermcap -lbsd ## Clipper intergraph -#LIBES= -ltermcap -lseq ## Sequent's Dynix -#LIBES= -ltermcap -lauth ## Ultrix with Enhanced Security -#LIBES= -ltermcap -ldir -lx ## Xenix 386 style things -#LIBES= -ltermcap -lndir -lsocket -ljobs ## masscomp RTU6.0 -#LIBES= -lcurses ## AIX on the rt -#LIBES= -lcurses ## TitanOS on the stellar -#LIBES= -ltermlib -lsocket -lnsl ## SysV4 w/o BSDTIMES or Solaris 2 -#LIBES= -lcurses ## SysV3 w/o networking -#LIBES= -lcurses -lnet ## SysV3 with networking -#LIBES= -lcurses -ldir ## SysV2 w/o networking & dirlib -#LIBES= -lcurses -ldir -lnet ## SysV2 with networking & dirlib -#LIBES= -lcurses -lbsd ## AIX on the IBM 370 or rs6000 or ps2 -#LIBES= -lcurses -lbsd ## ETA10 -#LIBES= -lcurses -lbsd ## Irix3.1 on the SGI-IRIS4D -#LIBES= -lcurses -lbsd -lc_s ## Irix3.3 on the SGI-IRIS4D w/o yp -#LIBES= -lcurses -lsun -lbsd -lc_s ## Irix3.3 on the SGI-IRIS4D with yp -#LIBES= -lcurses -lsocket -lbsd ## Amdahl UTS 2.1 -#LIBES= -lcurses -lsocket ## Intel's hypercube. -#LIBES= -lcurses -lsocket ## ns32000 based Opus. -#LIBES= -lcurses -lcposix ## ISC 2.2 without networking -#LIBES= -lcposix -lc_s -lcurses -linet ## ISC 2.2 with networking -#LIBES= -lcurses -lsec -lc_s ## ISC 2.0.2 without networking -#LIBES= -lcurses -linet -lsec -lc_s ## ISC 2.0.2 with networking -#LIBES= -lcurses -lintl -lcrypt ## SCO SysVR3.2v2.0 -#LIBES= -lcurses -lintl -lsocket -lcrypt ## SCO+ODT1.1 -#LIBES= -lposix -ltermcap ## A/UX 2.0 -#LIBES= -lposix -ltermcap -lc_s ## A/UX 3.0 -#LIBES= -ldirent -lcurses ## att3b1 cc w/o shared lib & dirlib -#LIBES= -shlib -ldirent -lcurses ## att3b1 gcc with shared lib & dirlib -#LIBES= -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a ## SysV4 with BSDTIMES -#LIBES= -lcurses -lnsl -lsocket -lc /usr/ucblib/libucb.a ## Stardent Vistra -#LIBES= -ltermc ## emx under OS/2 -#LIBES= ## Minix, VMS_POSIX -#LIBES= -ltermcap -lcrypt ## Multiflow -#LIBES= -ltermcap -lcrypt ## NetBSD -#LIBES= -lcurses ## DDE Supermax +## This is set by autoconf. +LIBES= @LIBS@ +## BSD style things +#LIBES= -ltermcap +## SunOS, HP-UX, pyramid +#LIBES= -ltermcap +## Linux +#LIBES= -ltermcap +## Linux with PW_SHADOW +#LIBES= -ltermcap -lshadow +## Tek XD88/10 (UTekV) with PW_SHADOW +#LIBES= -ltermcap -lsec +## Motorola MPC (sysV88) with PW_SHADOW +#LIBES= -ltermcap -lsec +## Mach +#LIBES= -ltermcap -lcs +## DEC osf1 on the alpha +#LIBES= -ltermcap -lbsd +## Intel paragon +#LIBES= -ltermcap -lbsd +## Clipper intergraph +#LIBES= -ltermcap -lbsd +## Sequent's Dynix +#LIBES= -ltermcap -lseq +## Ultrix with Enhanced Security +#LIBES= -ltermcap -lauth +## Xenix 386 style things +#LIBES= -ltermcap -ldir -lx +## masscomp RTU6.0 +#LIBES= -ltermcap -lndir -lsocket -ljobs +## AIX on the rt +#LIBES= -lcurses +## TitanOS on the stellar +#LIBES= -lcurses +## SysV4 w/o BSDTIMES or Solaris 2 +#LIBES= -ltermlib -lsocket -lnsl +## SysV3 w/o networking +#LIBES= -lcurses +## SysV3 with networking +#LIBES= -lcurses -lnet +## SysV2 w/o networking & dirlib +#LIBES= -lcurses -ldir +## SysV2 with networking & dirlib +#LIBES= -lcurses -ldir -lnet +## AIX on the IBM 370 or rs6000 or ps2 +#LIBES= -lcurses -lbsd +## ETA10 +#LIBES= -lcurses -lbsd +## Irix3.1 on the SGI-IRIS4D +#LIBES= -lcurses -lbsd +## Irix3.3 on the SGI-IRIS4D w/o yp +#LIBES= -lcurses -lbsd -lc_s +## Irix3.3 on the SGI-IRIS4D with yp +#LIBES= -lcurses -lsun -lbsd -lc_s +## Amdahl UTS 2.1 +#LIBES= -lcurses -lsocket -lbsd +## Intel's hypercube. +#LIBES= -lcurses -lsocket +## ns32000 based Opus. +#LIBES= -lcurses -lsocket +## ISC 2.2 without networking +#LIBES= -lcurses -lcposix +## ISC 2.2 with networking +#LIBES= -lcposix -lc_s -lcurses -linet +## ISC 2.0.2 without networking +#LIBES= -lcurses -lsec -lc_s +## ISC 2.0.2 with networking +#LIBES= -lcurses -linet -lsec -lc_s +## SCO SysVR3.2v2.0 +#LIBES= -lcurses -lintl -lcrypt +## SCO+ODT1.1 +#LIBES= -lcurses -lintl -lsocket -lcrypt +## A/UX 2.0 +#LIBES= -lposix -ltermcap +## A/UX 3.0 +#LIBES= -lposix -ltermcap -lc_s +## att3b1 cc w/o shared lib & dirlib +#LIBES= -ldirent -lcurses +## att3b1 gcc with shared lib & dirlib +#LIBES= -shlib -ldirent -lcurses +## SysV4 with BSDTIMES +#LIBES= -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a +## Stardent Vistra +#LIBES= -lcurses -lnsl -lsocket -lc /usr/ucblib/libucb.a +## emx under OS/2 +#LIBES= -ltermc +## Minix, VMS_POSIX +#LIBES= +## Multiflow +#LIBES= -ltermcap -lcrypt +## NetBSD +#LIBES= -ltermcap -lcrypt +## DDE Supermax +#LIBES= -lcurses ################################################################ ## EXTRAFLAGS and EXTRALIBS @@ -222,8 +285,10 @@ LIBES= @LIBS@ ## This is set by aut # #Solaris and HPUX require the BSD libraries with AFS. #We use -lc to use only what we require. -#AFSAUXLIB = -lsocket -lnsl -lc -lucb # Solaris -#AFSAUXLIB = -lc -lBSD # HPUX +# Solaris +#AFSAUXLIB = -lsocket -lnsl -lc -lucb +# HPUX +#AFSAUXLIB = -lc -lBSD # #AFSLIB = -L$(AFSLIBDIR) -L$(AFSLIBDIR)/afs -lkauth -lprot -lubik\ # -lauth -lrxkad -lsys -ldes -lrx -llwp -lcom_err\ @@ -244,26 +309,38 @@ EXTRALIBS = @HESLIB@ $(AFSLIB) @LIBICONV # will lose the editor and job control. # This is for setting your C preprocessor value. -CPP = @CPP@ # This is set by autoconf. +# This is set by autoconf. +CPP = @CPP@ # The -B tells gcc to use /bin/ld. This is to avoid using the gnu ld, which # on the suns does not know how to make dynamically linked binaries. -CC = @CC@ # This is set by autoconf. +# This is set by autoconf. +CC = @CC@ #CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings -Wextra -#CC= gcc -Wall -pipe -B/bin/ # -ansi -pedantic -#CC= gcc -m486 -pipe -Wall # Generate code for Intel 486 (linux) -#CC= shlicc # BSDI2.1 w/ shared libraries +# -ansi -pedantic +#CC= gcc -Wall -pipe -B/bin/ +# Generate code for Intel 486 (linux) +#CC= gcc -m486 -pipe -Wall +# BSDI2.1 w/ shared libraries +#CC= shlicc #CC= cc #CC= occ #CC= acc #CC= pcc #CC= hc -w -#CC= c89 # For VMS/POSIX -#CC= /bin/cc # For suns, w/o gcc and SVR4 -#CC= /usr/lib/sun.compile/cc # FPS 500 (+FPX) with Sun C compiler -#CC= /opt/SUNWspro/bin/cc # Solaris 2.1 -#CC= scc # Alliant fx2800 -#CC= cc -h0,ansi,novector,float0 # for NEC SX-4 +# For VMS/POSIX +#CC= c89 +# For suns, w/o gcc and SVR4 +#CC= /bin/cc +# FPS 500 (+FPX) with Sun C compiler +#CC= /usr/lib/sun.compile/cc +# Solaris 2.1 +#CC= /opt/SUNWspro/bin/cc +# Alliant fx2800 +#CC= scc +# for NEC SX-4 +#CC= cc -h0,ansi,novector,float0 #CC= lcc -wa +CC_FOR_GETHOST = @CC_FOR_GETHOST@ ED= ed AS= as RM= rm @@ -272,8 +349,10 @@ VGRIND= csh /usr/ucb/vgrind CTAGS= /usr/ucb/ctags #XSTR= /usr/ucb/xstr SCCS= /usr/local/sccs -PARALLEL=12 # Make the multi-max run fast. -#P=& # Use Sequent's parallel make +# Make the multi-max run fast. +PARALLEL=12 +# Use Sequent's parallel make +#P=& P= prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -282,12 +361,17 @@ mandir=@datarootdir@/man MANSECT=1 DESTBIN=${DESTDIR}${bindir} DESTMAN=${DESTDIR}${mandir}/man${MANSECT} -# DESTMAN=${DESTDIR}/catman/man${MANSECT} # A/UX -# DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT} # Stardent Vistra (SysVR4) -# DESTMAN=/usr/catman/1l # Amiga unix (SysVR4) +# A/UX +# DESTMAN=${DESTDIR}/catman/man${MANSECT} +# Stardent Vistra (SysVR4) +# DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT} +# Amiga unix (SysVR4) +# DESTMAN=/usr/catman/1l EXEEXT=@EXEEXT@ FTPAREA=/usr/spool/ftp +BUILD_CATALOGS = @BUILD_CATALOGS@ + ASSRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ @@ -330,9 +414,9 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThin host.defs gethost.c tcsh.man2html configure.in configure config.h.in \ tests/testsuite.at TESTFILES= tests/aliases.at tests/arguments.at tests/commands.at \ - tests/expr.at tests/lexical.at tests/mb-eucjp.at tests/mb-utf8.at \ - tests/noexec.at tests/syntax.at tests/subst.at tests/variables.at \ - tests/sh.dol.at + tests/expr.at tests/lexical.at tests/mb-eucjp.at \ + tests/mb-utf8.at tests/noexec.at tests/syntax.at tests/subst.at \ + tests/variables.at tests/sh.dol.at VHSRCS=${PVSRCS} ${AVSRCS} @@ -345,7 +429,7 @@ DISTSRCS= ${PSSRCS} ${TWSRCS} ${EDSRCS} OBJS= ${SHOBJS} ${TWOBJS} ${EDOBJS} ${TCOBJS} -all: ${BUILD} +all: ${BUILD} catalogs tcsh$(EXEEXT):$(P) ${OBJS} rm -f tcsh$(EXEEXT) core @@ -365,7 +449,7 @@ pure:$(P) ${OBJS} gethost: gethost.c sh.err.h tc.const.h sh.h rm -f gethost - ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} + ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c tc.defs.c: gethost host.defs @rm -f $@.tmp @@ -463,7 +547,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/co echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ } >$(srcdir)/tests/package.m4 -$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir}/tests/testsuite.at $(TESTFILES) +$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir)/tests/testsuite.at $(TESTFILES) autom4te --language=autotest -I $(srcdir)/tests \ $(srcdir)/tests/testsuite.at -o $@.tmp mv $@.tmp $@ @@ -511,20 +595,36 @@ vgrind: install-strip: install -install: tcsh$(EXEEXT) +install: tcsh$(EXEEXT) install.catalogs install.man -mkdir -p ${DESTBIN} -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) -strip ${DESTBIN}/tcsh$(EXEEXT) chmod 755 ${DESTBIN}/tcsh$(EXEEXT) +install.catalogs: + @test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0 + install.man: tcsh.man -mkdir -p ${DESTMAN} -rm -f ${DESTMAN}/tcsh.${MANSECT} cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT} chmod 444 ${DESTMAN}/tcsh.${MANSECT} -install.cygwin: install install.man +# Amiga Unix +#install.man: tcsh.man +# compress tcsh.man +# cp tcsh.man.Z ${DESTMAN}/tcsh.Z +# chmod 444 ${DESTMAN}/tcsh.Z + +# Apple A/UX +#install.man: tcsh.man +# -rm -f ${DESTMAN}/tcsh.${MANSECT}.Z +# nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z +# chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z + +install.cygwin: install + -gzip ${DESTMAN}/tcsh.${MANSECT} -mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh cp ${srcdir}/FAQ ${srcdir}/Fixes ${DESTDIR}${prefix}/share/doc/tcsh cp ${srcdir}/NewThings ${srcdir}/README ${DESTDIR}${prefix}/share/doc/tcsh @@ -542,24 +642,15 @@ install.cygwin: install install.man cp -p ${srcdir}/cygwin/postinstall.sh ${DESTDIR}/etc/postinstall/tcsh.sh cp -p ${srcdir}/cygwin/preremove.sh ${DESTDIR}/etc/preremove/tcsh.sh -# Amiga Unix -#install.man: tcsh.man -# compress tcsh.man -# cp tcsh.man.Z ${DESTMAN}/tcsh.Z -# chmod 444 ${DESTMAN}/tcsh.Z - -# Apple A/UX -#install.man: tcsh.man -# -rm -f ${DESTMAN}/tcsh.${MANSECT}.Z -# nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z -# chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z - -clean: +clean: clean.catalogs ${RM} -f a.out strings x.c xs.c tcsh$(EXEEXT) tcsh.a _MAKE_LOG gethost ${RM} -f *.${SUF} *.i *.s ${RM} -f sh.prof.c ed.defns.h tc.const.h sh.err.h tc.defs.c ${RM} -f tcsh.*.m tcsh.*.cat +clean.catalogs: + @test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} clean) || exit 0 + veryclean: clean ${RM} -f Makefile config.h config_p.h ${RM} -f config.status config.cache config.log tcsh.ps @@ -607,7 +698,7 @@ shar: rm -rf tcsh-${VERSION} catalogs: - @(cd nls; make catalogs) + @test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} catalogs) || exit 0 tcsh-${VERSION}.tar.Z: rm -rf tcsh-${VERSION} Modified: stable/7/contrib/tcsh/Ported ============================================================================== --- stable/7/contrib/tcsh/Ported Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/Ported Wed Mar 7 22:19:43 2012 (r232674) @@ -7,7 +7,7 @@ find it out-of-date, or you have additio christos -VENDOR : sun +VENDOR : Sun MODELS : sun3, sun4, sun386i COMPILER: cc, gcc, acc CFLAGS : normal @@ -18,7 +18,7 @@ ENVIRON : n/a NOTES : Don't compile with /usr/5bin/cc VERSION : 6.08 -VENDOR : sun +VENDOR : Sun MODELS : sun4, ultra COMPILER: cc, gcc CFLAGS : normal @@ -34,18 +34,29 @@ NOTES : The sunpro compiler cannot compi : point failures of programs exec'ed from tcsh. VERSION : 6.08 -VENDOR : sun +VENDOR : Sun MODELS : ultra COMPILER: WorkShop cc CFLAGS : normal LIBES : -lcurses -lsocket -lnsl -OS : solaris 2.6 +OS : solaris 2.6, 2.7, 8 CONFIG : sol26 ENVIRON : n/a NOTES : none VERSION : 6.08 -VENDOR : sun +VENDOR : Sun +MODELS : ultra, i686, x86_64 +COMPILER: Sun Studio cc +CFLAGS : normal +LIBES : -lcurses -lsocket -lnsl +OS : solaris 9, 10 +CONFIG : sol29 +ENVIRON : n/a +NOTES : none +VERSION : 6.18 + +VENDOR : Sun MODELS : i386 COMPILER: cc, gcc CFLAGS : -D__STDC__=0 @@ -56,7 +67,7 @@ ENVIRON : n/a NOTES : n/a VERSION : 6.04.13 -VENDOR : sun +VENDOR : Sun MODELS : sun4 COMPILER: gcc CFLAGS : normal Modified: stable/7/contrib/tcsh/README ============================================================================== --- stable/7/contrib/tcsh/README Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/README Wed Mar 7 22:19:43 2012 (r232674) @@ -1,4 +1,4 @@ -This is tcsh version 6.17.00. Tcsh is a version of the Berkeley +This is tcsh version 6.18.01. Tcsh is a version of the Berkeley C-Shell, with the addition of: a command line editor, command and file name completion, listing, etc. and a bunch of small additions to the shell itself. @@ -87,7 +87,7 @@ To install tcsh: 10) Enjoy. -12) PLEASE file any bug reports (and fixes), code for new features at: +11) PLEASE file any bug reports (and fixes), code for new features at: http://bugs.gw.com/ Modified: stable/7/contrib/tcsh/WishList ============================================================================== --- stable/7/contrib/tcsh/WishList Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/WishList Wed Mar 7 22:19:43 2012 (r232674) @@ -52,17 +52,6 @@ ey ) - bhooglan _________________________________________________________________ - I'm a long-time faithful user of tcsh, and one thing has always bugged - me -- the need to type "rehash" at a prompt when adding a new command. - My suggestions is to change tcsh so before printing "Command not - found.", it first searches its entire path and rebuilds its hash - table. Only after doing this, and if the command is still not in the - path, then print "Command not found.". I realize there are some - extreme cases in which this is suboptimal, but in most cases with - normal users this would be a big win, and simplify the manual and - perhaps even the code. - _________________________________________________________________ - Wish "tcsh -l" would accept other flags. At least "-c". Currently I can't get ssh to have the right environment unless it is a Modified: stable/7/contrib/tcsh/complete.tcsh ============================================================================== --- stable/7/contrib/tcsh/complete.tcsh Wed Mar 7 22:09:40 2012 (r232673) +++ stable/7/contrib/tcsh/complete.tcsh Wed Mar 7 22:19:43 2012 (r232674) @@ -1,5 +1,5 @@ # -# $tcsh: complete.tcsh,v 1.51 2007/10/01 21:51:59 christos Exp $ +# $tcsh: complete.tcsh,v 1.52 2010/05/07 17:54:13 christos Exp $ # example file using the new completion code # # Debian GNU/Linux @@ -636,7 +636,7 @@ if ($?_complete) then complete nmap 'n@-e@`ifconfig -l`@' 'p/*/$hostnames/' complete perldoc 'n@*@`\ls -1 /usr/libdata/perl/5.*/pod | sed s%\\.pod.\*\$%%`@' complete postfix 'n/*/(start stop reload abort flush check)/' - complete postmap 'n/1/(hash: regexp:)' 'c/hash:/f/' 'c/regexp:/f/' + complete postmap 'n/1/(hash: regexp:)/' 'c/hash:/f/' 'c/regexp:/f/' complete rcsdiff 'p@1@`\ls -1a RCS | sed -e "s/\(.*\),v/\1/"`@' complete X 'c/-/(I a ac allowMouseOpenFail allowNonLocalModInDev \ allowNonLocalXvidtune ar1 ar2 audit auth bestRefresh \ Modified: stable/7/contrib/tcsh/config.guess ============================================================================== --- stable/7/contrib/tcsh/config.guess Wed Mar 7 22:09:40 2012 (r232673) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-7@FreeBSD.ORG Thu Mar 8 09:56:07 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D19C31065677; Thu, 8 Mar 2012 09:56:07 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BBF1A8FC23; Thu, 8 Mar 2012 09:56:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q289u7V6036539; Thu, 8 Mar 2012 09:56:07 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q289u7dn036537; Thu, 8 Mar 2012 09:56:07 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201203080956.q289u7dn036537@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 8 Mar 2012 09:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232688 - stable/7/lib/libc/uuid X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Mar 2012 09:56:07 -0000 Author: ae Date: Thu Mar 8 09:56:07 2012 New Revision: 232688 URL: http://svn.freebsd.org/changeset/base/232688 Log: MFC r232339: Note that memory should be freed after uuid_to_string(3) call. PR: docs/161808 Modified: stable/7/lib/libc/uuid/uuid.3 Directory Properties: stable/7/lib/libc/uuid/ (props changed) Modified: stable/7/lib/libc/uuid/uuid.3 ============================================================================== --- stable/7/lib/libc/uuid/uuid.3 Thu Mar 8 09:55:47 2012 (r232687) +++ stable/7/lib/libc/uuid/uuid.3 Thu Mar 8 09:56:07 2012 (r232688) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 2008 +.Dd March 1, 2012 .Dt UUID 3 .Os .Sh NAME @@ -84,6 +84,15 @@ A 16-bit hash value can be obtained by c .Fn uuid_hash . .Pp The +.Fn uuid_to_string +function set +.Fa *str +to be a pointer to a buffer sufficiently large to hold the string. +This pointer should be passed to +.Xr free 3 +to release the allocated storage when it is no longer needed. +.Pp +The .Fn uuid_enc_le and .Fn uuid_enc_be @@ -117,7 +126,7 @@ The UUID does not have a known version. .It Dv uuid_s_invalid_string_uuid The string representation of an UUID is not valid. .It Dv uuid_s_no_memory -The meaning of the code escaped the writers mind. +The function can not allocate memory to store an UUID representation. .El .Sh SEE ALSO .Xr uuidgen 1 , From owner-svn-src-stable-7@FreeBSD.ORG Sat Mar 10 18:37:01 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE1DB1065686; Sat, 10 Mar 2012 18:37:01 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A80338FC17; Sat, 10 Mar 2012 18:37:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2AIb14n070888; Sat, 10 Mar 2012 18:37:01 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2AIb1Jq070886; Sat, 10 Mar 2012 18:37:01 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201203101837.q2AIb1Jq070886@svn.freebsd.org> From: Eitan Adler Date: Sat, 10 Mar 2012 18:37:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232792 - stable/7/usr.bin/indent X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Mar 2012 18:37:01 -0000 Author: eadler Date: Sat Mar 10 18:37:01 2012 New Revision: 232792 URL: http://svn.freebsd.org/changeset/base/232792 Log: MFC r232471: Document the [n]eei and [n]bacc options PR: docs/165009 Approved by: bcr Modified: stable/7/usr.bin/indent/indent.1 Directory Properties: stable/7/usr.bin/indent/ (props changed) Modified: stable/7/usr.bin/indent/indent.1 ============================================================================== --- stable/7/usr.bin/indent/indent.1 Sat Mar 10 18:36:40 2012 (r232791) +++ stable/7/usr.bin/indent/indent.1 Sat Mar 10 18:37:01 2012 (r232792) @@ -34,7 +34,7 @@ .\" @(#)indent.1 8.1 (Berkeley) 7/1/93 .\" $FreeBSD$ .\" -.Dd June 29, 2004 +.Dd March 3, 2012 .Dt INDENT 1 .Os .Sh NAME @@ -43,9 +43,12 @@ .Sh SYNOPSIS .Nm .Op Ar input-file Op Ar output-file +.Op Fl bacc | Fl nbacc .Op Fl bad | Fl nbad .Op Fl bap | Fl nbap .Bk -words +.Op Fl ei | Fl ei +.Op Fl eei | Fl eei .Op Fl bbb | Fl nbbb .Ek .Op Fl \&bc | Fl nbc @@ -126,6 +129,15 @@ checks to make sure that it is different The options listed below control the formatting style imposed by .Nm . .Bl -tag -width Op +.It Fl bacc , nbacc +If +.Fl bacc +is specified, a blank line is forced around every conditional +compilation block. +For example, in front of every #ifdef and after every #endif. +Other blank lines surrounding such blocks will be swallowed. +Default: +.Fl nbacc . .It Fl bad , nbad If .Fl bad @@ -267,6 +279,16 @@ will have the same indentation as the pr statement. The default is .Fl ei . +.It Fl eei , neei +Enables (disables) extra indentation on continuation lines of +the expression part of +.Ic if +and +.Ic while +statements. +These continuation lines will be indented one extra level. +The default is +.Fl neei . .It Fl fbs , nfbs Enables (disables) splitting the function declaration and opening brace across two lines.