[Emacs-diffs] Changes to emacs/nt/cmdproxy.c

[Miles Bader]

Index: emacs/nt/cmdproxy.c
diff -c emacs/nt/cmdproxy.c:1.11 emacs/nt/cmdproxy.c:1.12
*** emacs/nt/cmdproxy.c:1.11    Sun Mar 18 11:54:35 2001
--- emacs/nt/cmdproxy.c Tue Feb  4 09:16:25 2003
***************
*** 230,236 ****
    int i, rc;
  
    /* Search the directory for the program.  */
!   for (i = 0; i < n_exts; i++) 
      {
        rc = SearchPath (dir, exec, exts[i], bufsize, buffer, &dummy);
        if (rc > 0)
--- 230,236 ----
    int i, rc;
  
    /* Search the directory for the program.  */
!   for (i = 0; i < n_exts; i++)
      {
        rc = SearchPath (dir, exec, exts[i], bufsize, buffer, &dummy);
        if (rc > 0)
***************
*** 240,246 ****
    return 0;
  }
  
! /* Return the absolute name of executable file PROG, including 
     any file extensions.  If an absolute name for PROG cannot be found,
     return NULL.  */
  char *
--- 240,246 ----
    return 0;
  }
  
! /* Return the absolute name of executable file PROG, including
     any file extensions.  If an absolute name for PROG cannot be found,
     return NULL.  */
  char *
***************
*** 272,289 ****
        return NULL;
      }
  
!   if (GetCurrentDirectory (MAX_PATH, curdir) <= 0) 
      return NULL;
  
    /* Relative path; search in current dir. */
!   if (strpbrk (prog, "\\")) 
      {
        if (search_dir (curdir, prog, MAX_PATH, absname) > 0)
        return strdup (absname);
!       else 
        return NULL;
      }
!   
    /* Just filename; search current directory then PATH.  */
    path = alloca (strlen (getenv ("PATH")) + strlen (curdir) + 2);
    strcpy (path, curdir);
--- 272,289 ----
        return NULL;
      }
  
!   if (GetCurrentDirectory (MAX_PATH, curdir) <= 0)
      return NULL;
  
    /* Relative path; search in current dir. */
!   if (strpbrk (prog, "\\"))
      {
        if (search_dir (curdir, prog, MAX_PATH, absname) > 0)
        return strdup (absname);
!       else
        return NULL;
      }
! 
    /* Just filename; search current directory then PATH.  */
    path = alloca (strlen (getenv ("PATH")) + strlen (curdir) + 2);
    strcpy (path, curdir);
***************
*** 304,310 ****
  
        /* Move to the next directory.  */
        path = p + 1;
!     } 
  
    return NULL;
  }
--- 304,310 ----
  
        /* Move to the next directory.  */
        path = p + 1;
!     }
  
    return NULL;
  }
***************
*** 322,328 ****
    char * cmdline = GetCommandLine ();
    int arg_bytes = 0;
  
!   
  }
  #endif
  
--- 322,328 ----
    char * cmdline = GetCommandLine ();
    int arg_bytes = 0;
  
! 
  }
  #endif
  
***************
*** 384,390 ****
    sec_attrs.nLength = sizeof (sec_attrs);
    sec_attrs.lpSecurityDescriptor = NULL;
    sec_attrs.bInheritHandle = FALSE;
!   
    memset (&start, 0, sizeof (start));
    start.cb = sizeof (start);
  
--- 384,390 ----
    sec_attrs.nLength = sizeof (sec_attrs);
    sec_attrs.lpSecurityDescriptor = NULL;
    sec_attrs.bInheritHandle = FALSE;
! 
    memset (&start, 0, sizeof (start));
    start.cb = sizeof (start);