From 6b0273cd0a5ffcb7dc98b311bbfb4a112fc7db65 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 16 Jul 2008 07:01:36 +0000 Subject: [PATCH] * editfns.c (Fuser_full_name): Replace the only use of USER_FULL_NAME with its value. * config.in: Regenerate. * configure.in (freebsd, kfreebsd): Undo part of previous change. (USER_FULL_NAME): Remove, not used anymore. * configure: Regenerate. --- ChangeLog | 6 ++++++ configure | 28 +++++++++++----------------- configure.in | 15 ++------------- src/ChangeLog | 6 ++++++ src/config.in | 11 ----------- src/editfns.c | 2 +- 6 files changed, 26 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed0e15ac134..8276008f2d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-16 Dan Nicolaescu + + * configure.in (freebsd, kfreebsd): Undo part of previous change. + (USER_FULL_NAME): Remove, not used anymore. + * configure: Regenerate. + 2008-07-15 Adrian Robert Changes and additions for NeXTstep windowing system (Cocoa and diff --git a/configure b/configure index 54ece25cda9..bb726499e2c 100755 --- a/configure +++ b/configure @@ -2405,17 +2405,17 @@ machine='' opsys='' unported=no case "${canonical}" in ## FreeBSD ports - *-*-*freebsd* ) + *-*-freebsd* ) opsys=freebsd case "${canonical}" in alpha*-*-freebsd*) machine=alpha ;; arm*-*-freebsd*) machine=arm ;; ia64-*-freebsd*) machine=ia64 ;; - sparc-*-freebsd*) machine=sparc ;; + sparc-*-freebsd*) machine=sparc ;; sparc64-*-freebsd*) machine=sparc ;; powerpc-*-freebsd*) machine=macppc ;; i[3456]86-*-freebsd*) machine=intel386 ;; - amd64-*-freebsd*|x86_64-*-*freebsd*) machine=amdx86-64 ;; + amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;; esac ;; @@ -16933,7 +16933,6 @@ cat >>conftest.$ac_ext <<_ACEOF # endif #endif -#include #include #ifdef HAVE_UNISTD_H @@ -17082,15 +17081,12 @@ main () isn't worth using anyway. */ alarm (60); - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; - + for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) + continue; + time_t_max--; + if ((time_t) -1 < 0) + for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) + continue; delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) { @@ -17105,12 +17101,10 @@ main () && mktime_test ((time_t) (60 * 60 * 24)))) return 1; - for (j = 1; ; j <<= 1) + for (j = 1; 0 < j; j *= 2) if (! bigtime_test (j)) return 1; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) + if (! bigtime_test (j - 1)) return 1; } return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); diff --git a/configure.in b/configure.in index 92d617c0b30..aedf5295f69 100644 --- a/configure.in +++ b/configure.in @@ -294,7 +294,7 @@ machine='' opsys='' unported=no case "${canonical}" in ## FreeBSD ports - *-*-*freebsd* ) + *-*-freebsd* ) opsys=freebsd case "${canonical}" in alpha*-*-freebsd*) machine=alpha ;; @@ -304,7 +304,7 @@ case "${canonical}" in sparc64-*-freebsd*) machine=sparc ;; powerpc-*-freebsd*) machine=macppc ;; i[3456]86-*-freebsd*) machine=intel386 ;; - amd64-*-freebsd*|x86_64-*-*freebsd*) machine=amdx86-64 ;; + amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;; esac ;; @@ -2610,17 +2610,6 @@ AH_BOTTOM([ #undef MAC_OS #undef MAC_OSX -/* Define USER_FULL_NAME to return a string - that is the user's full name. - It can assume that the variable `pw' - points to the password file entry for this user. - - At some sites, the pw_gecos field contains - the user's full name. If neither this nor any other - field contains the right thing, use pw_name, - giving the user's login name, since that is better than nothing. */ -#define USER_FULL_NAME pw->pw_gecos - /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* Turned on June 1996 supposing nobody will mind it. */ diff --git a/src/ChangeLog b/src/ChangeLog index 5a71765c29b..491931820ec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-07-16 Dan Nicolaescu + + * editfns.c (Fuser_full_name): Replace the only use of + USER_FULL_NAME with its value. + * config.in: Regenerate. + 2008-07-16 David Reitter * Makefile.in: add ns-win, ns-carbon-compat, easy-mmode and diff --git a/src/config.in b/src/config.in index 714d1d44f80..94750388c24 100644 --- a/src/config.in +++ b/src/config.in @@ -1001,17 +1001,6 @@ along with GNU Emacs. If not, see . */ #undef MAC_OS #undef MAC_OSX -/* Define USER_FULL_NAME to return a string - that is the user's full name. - It can assume that the variable `pw' - points to the password file entry for this user. - - At some sites, the pw_gecos field contains - the user's full name. If neither this nor any other - field contains the right thing, use pw_name, - giving the user's login name, since that is better than nothing. */ -#define USER_FULL_NAME pw->pw_gecos - /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* Turned on June 1996 supposing nobody will mind it. */ diff --git a/src/editfns.c b/src/editfns.c index 0487ecf4707..71973cec914 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1370,7 +1370,7 @@ name, or nil if there is no such user. */) if (!pw) return Qnil; - p = (unsigned char *) USER_FULL_NAME; + p = (unsigned char *) pw->pw_gecos; /* Chop off everything after the first comma. */ q = (unsigned char *) index (p, ','); full = make_string (p, q ? q - p : strlen (p)); -- 2.39.2