[Emacs-diffs] Changes to emacs/src/w32.c,v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      07/06/20 08:46:20

Index: w32.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32.c,v
retrieving revision 1.111
retrieving revision 1.111.2.1
diff -u -b -r1.111 -r1.111.2.1
--- w32.c       23 Feb 2007 18:40:41 -0000      1.111
+++ w32.c       20 Jun 2007 08:46:20 -0000      1.111.2.1
@@ -491,15 +491,11 @@
   HANDLE          token = NULL;
   SID_NAME_USE    user_type;
 
-  if (
-                       open_process_token (GetCurrentProcess (), TOKEN_QUERY, 
&token)
-      && get_token_information (
-                                       token, TokenUser,
+  if (open_process_token (GetCurrentProcess (), TOKEN_QUERY, &token)
+      && get_token_information (token, TokenUser,
                              (PVOID) user_sid, sizeof (user_sid), &trash)
-      && lookup_account_sid (
-                                       NULL, *((PSID *) user_sid), name, 
&length,
-                          domain, &dlength, &user_type)
-                       )
+      && lookup_account_sid (NULL, *((PSID *) user_sid), name, &length,
+                            domain, &dlength, &user_type))
     {
       strcpy (the_passwd.pw_name, name);
       /* Determine a reasonable uid value. */
@@ -1110,7 +1106,9 @@
          {
            int dont_free = 0;
 
-           if ((lpval = w32_get_resource (env_vars[i].name, &dwType)) == NULL)
+           if ((lpval = w32_get_resource (env_vars[i].name, &dwType)) == NULL
+               /* Also ignore empty environment variables.  */
+               || *lpval == 0)
              {
                lpval = env_vars[i].def_value;
                dwType = REG_EXPAND_SZ;
@@ -2481,7 +2479,7 @@
          != INVALID_HANDLE_VALUE)
     {
       /* This is more accurate in terms of gettting the correct number
-        of links, but is quite slow (it is noticable when Emacs is
+        of links, but is quite slow (it is noticeable when Emacs is
         making a list of file name completions). */
       BY_HANDLE_FILE_INFORMATION info;
 
@@ -2966,7 +2964,7 @@
   WSAEINVALIDPROCTABLE    , "Invalid procedure table from service provider",
   WSAEINVALIDPROVIDER     , "Invalid service provider version number",
   WSAEPROVIDERFAILEDINIT  , "Unable to initialize a service provider",
-  WSASYSCALLFAILURE       , "System call failured",
+  WSASYSCALLFAILURE       , "System call failure",
   WSASERVICE_NOT_FOUND    , "Service not found",           /* not sure */
   WSATYPE_NOT_FOUND       , "Class type not found",
   WSA_E_NO_MORE           , "No more resources available",  /* really not sure 
*/
@@ -4160,7 +4158,7 @@
   SetConsoleCtrlHandler(shutdown_handler, TRUE);
 }
 
-/* end of nt.c */
+/* end of w32.c */
 
 /* arch-tag: 90442dd3-37be-482b-b272-ac752e3049f1
    (do not change this comment) */