Latest from Cyclic Software

3 files changed, 21 insertions, 4 deletions

diff --git a/gnu/usr.bin/cvs/windows-NT/ChangeLog b/gnu/usr.bin/cvs/windows-NT/ChangeLog
index c6f954be2e5..dd0d855dadc 100644
--- a/gnu/usr.bin/cvs/windows-NT/ChangeLog
+++ b/gnu/usr.bin/cvs/windows-NT/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-26  Larry Jones  <larry.jones@sdrc.com>
+
+	* config.h: Define REGEX_MALLOC and _REGEX_RE_COMP.
+
+2000-01-02  Karl Fogel  <kfogel@red-bean.com>
+
+	* pwd.c (getlogin): try to find login name in environment
+	variables before asking the operating system.
+
 1999-02-26  Jim Kingdon  <http://www.cyclic.com>
 
 	* options.h: Make RELATIVE_REPOS the default, as in
diff --git a/gnu/usr.bin/cvs/windows-NT/config.h b/gnu/usr.bin/cvs/windows-NT/config.h
index 69b0fe75c61..33550d595cc 100644
--- a/gnu/usr.bin/cvs/windows-NT/config.h
+++ b/gnu/usr.bin/cvs/windows-NT/config.h
@@ -325,3 +325,8 @@ extern char *sock_strerror (int errnum);
    moot since the use of buffer.c ensures that writes will only be as big
    as the buffers).  */
 #define SEND_NEVER_PARTIAL 1
+
+/* Force lib/regex.c to use malloc instead of messing around with alloca
+   and define the old re_comp routines that we use.  */
+#define REGEX_MALLOC 1
+#define _REGEX_RE_COMP 1
diff --git a/gnu/usr.bin/cvs/windows-NT/pwd.c b/gnu/usr.bin/cvs/windows-NT/pwd.c
index 683bb0c3653..62f32cd3ad8 100644
--- a/gnu/usr.bin/cvs/windows-NT/pwd.c
+++ b/gnu/usr.bin/cvs/windows-NT/pwd.c
@@ -87,13 +87,16 @@ getgrnam (char *name)
 char *
 getlogin ()
 {
+  /* This is how a windows user would override their login name. */
   if (!login)
-     login = win32getlogin();
-
-  if (!login)			/* have we been called before? */
     login = lookup_env (login_strings);
 
-  if (!login)			/* have we been successful? */
+  /* In the absence of user override, ask the operating system. */
+  if (!login)
+     login = win32getlogin();
+
+  /* If all else fails, fall back on Old Faithful. */
+  if (!login)
     login = anonymous;
 
   return login;