xemacs-beta: src/nt.c comparison

comparison src/nt.c @ 288:e11d67e05968 r21-0b42

Import from CVS: tag r21-0b42

author	cvs
date	Mon, 13 Aug 2007 10:35:54 +0200
parents	c42ec1d1cded
children	c9fe270a4101

comparison

equal deleted inserted replaced

-:13a0bd77a29d
+:e11d67e05968
 #include <io.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <signal.h>
+#include <direct.h>
 /* must include CRT headers *before* config.h */
 /* ### I don't believe it - martin */
 #include <config.h>
 #include "systime.h"
 #if 0
 extern Lisp_Object Vwin32_generate_fake_inodes;
 #endif
 extern Lisp_Object Vmswindows_get_true_file_attributes;
+extern char *get_home_directory(void);
 static char startup_dir[ MAXPATHLEN ];
 /* Get the current working directory.  */
 char *
 getwd (char *dir)
 return &the_passwd;
 return NULL;
 }
 struct passwd *
-getpwnam (char *name)
+getpwnam (const char *name)
 {
 struct passwd *pw;
 pw = getpwuid (getuid ());
 if (!pw)
 the_passwd.pw_uid = 123;
 the_passwd.pw_gid = 123;
 }
 /* Ensure HOME and SHELL are defined. */
+#if 0
+/*
+* With XEmacs, setting $HOME is deprecated.
+*/
 if (getenv ("HOME") == NULL)
 putenv ("HOME=c:/");
+#endif
 if (getenv ("SHELL") == NULL)
 putenv ((GetVersion () & 0x80000000) ? "SHELL=command" : "SHELL=cmd");
 /* Set dir and shell from environment variables. */
-strcpy (the_passwd.pw_dir, getenv ("HOME"));
+strcpy (the_passwd.pw_dir, get_home_directory());
 strcpy (the_passwd.pw_shell, getenv ("SHELL"));
 if (token)
 CloseHandle (token);
 }
 user enter it, so we define EMACS_CONFIGURATION to invoke this runtime
 routine.  */
 static char configuration_buffer[32];
-char *
+const char *
 get_emacs_configuration (void)
 {
 char *arch, *oem, *os;
 /* Determine the processor type.  */
 static int    dir_is_fat;
 static char   dir_pathname[MAXPATHLEN+1];
 static WIN32_FIND_DATA dir_find_data;
 DIR *
-opendir (char *filename)
+opendir (const char *filename)
 {
 DIR *dirp;
 /* Opening is done by FindFirstFile.  However, a read is inherent to
 this operation, so we defer the open until read time.  */
 	    case FILE_TYPE_CHAR:
 	    case FILE_TYPE_UNKNOWN:
 	    default:
 	      buf->st_mode = _S_IFCHR;
 	    }
-	  buf->st_nlink = info.nNumberOfLinks;
+	  buf->st_nlink = (short) info.nNumberOfLinks;
 	  /* Might as well use file index to fake inode values, but this
 	     is not guaranteed to be unique unless we keep a handle open
 	     all the time (even then there are situations where it is
 	     not unique).  Reputedly, there are at most 48 bits of info
 	     (on NTFS, presumably less on FAT). */
 static DWORD gen_num = 0;
 fake_inode = ++gen_num;
 }
 #endif
-/* MSVC defines _ino_t to be short; other libc's might not.  */
+/* #### MSVC defines _ino_t to be short; other libc's might not.  */
-if (sizeof (buf->st_ino) == 2)
+buf->st_ino = (unsigned short) (fake_inode ^ (fake_inode >> 16));
-buf->st_ino = fake_inode ^ (fake_inode >> 16);
-else
-buf->st_ino = fake_inode;
 /* consider files to belong to current user */
 buf->st_uid = the_passwd.pw_uid;
 buf->st_gid = the_passwd.pw_gid;
 int
 sys_pipe (int * phandles)
 {
 int rc;
 unsigned flags;
-child_process * cp;
 /* make pipe handles non-inheritable; when we spawn a child, we
 replace the relevant handle with an inheritable one.  Also put
 pipes into binary mode; we will do text mode translation ourselves
 if required.  */
 return STATUS_READ_ERROR;
 if ((fd_info[fd].flags & (FILE_PIPE | FILE_SOCKET)) == 0
 || (fd_info[fd].flags & FILE_READ) == 0)
 {
-DebPrint (("_sys_read_ahead: internal error: fd %d is not a pipe or socket!\n", fd));
+/* fd is not a pipe or socket */
 abort ();
 }
 cp->status = STATUS_READ_IN_PROGRESS;
 		fd_info[fd].flags |= FILE_AT_EOF;
 	      return nchars;
 	    case STATUS_READ_READY:
 	    case STATUS_READ_IN_PROGRESS:
-	      DebPrint (("sys_read called when read is in progress\n"));
 	      errno = EWOULDBLOCK;
 	      return -1;
 	    case STATUS_READ_SUCCEEDED:
 	      /* consume read-ahead char */
 	    case STATUS_READ_ACKNOWLEDGED:
 	      break;
 	    default:
-	      DebPrint (("sys_read: bad status %d\n", current_status));
 	      errno = EBADF;
 	      return -1;
 	    }
 	  if (fd_info[fd].flags & FILE_PIPE)
 return nchars;
 }
 void
-term_ntproc ()
+term_ntproc (int unused)
 {
 }
 void
 init_ntproc ()
 msw_sighandler msw_sigset (int nsig, msw_sighandler handler)
 {
 /* We delegate some signals to the system function */
 if (nsig == SIGFPE || nsig == SIGABRT || nsig == SIGINT)
-{
+return signal (nsig, handler);
-signal (nsig, handler);
-return;
-}
 if (nsig < 0 || nsig > SIG_MAX)
 {
 errno = EINVAL;
-return;
+return NULL;
 }
 /* Store handler ptr */
-signal_handlers[nsig] = handler;
+{
+msw_sighandler old_handler = signal_handlers[nsig];
+signal_handlers[nsig] = handler;
+return old_handler;
+}
 }
 int msw_sighold (int nsig)
 {
 if (nsig < 0 || nsig > SIG_MAX)

Mercurial > hg > xemacs-beta

comparison src/nt.c @ 288:e11d67e05968 r21-0b42