xemacs-beta: src/editfns.c comparison

comparison src/editfns.c @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	de805c49cfc1
children	41dbb7a9d5f2

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 /* Hacked on for Mule by Ben Wing, December 1994. */
 #include <config.h>
 #include "lisp.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include "buffer.h"
 #include "commands.h"
 #include "events.h"             /* for EVENTP */
 #include "extents.h"
 #include "line-number.h"
 #include "systime.h"
 #include "sysdep.h"
 #include "syspwd.h"
-#include "sysfile.h"			/* for getcwd */
 /* Some static data, and a function to initialize it for each run */
 Lisp_Object Vsystem_name;	/* #### - I don't see why this should be */
 				/* static, either...  --Stig */
 /* It's useful to be able to set this as user customization, so we'll
 keep it. */
 Lisp_Object Vuser_full_name;
 EXFUN (Fuser_full_name, 1);
+char *get_system_name (void);
 Lisp_Object Qformat;
 Lisp_Object Qpoint, Qmark, Qregion_beginning, Qregion_end;
 Lisp_Object Quser_files_and_directories;
 #endif
 if ((p = getenv ("NAME")))
 /* I don't think it's the right thing to do the ampersand
 modification on NAME.  Not that it matters anymore...  -hniksic */
-Vuser_full_name = build_ext_string (p, Qnative);
+Vuser_full_name = build_ext_string (p, FORMAT_OS);
 else
 Vuser_full_name = Fuser_full_name (Qnil);
 }
 DEFUN ("char-to-string", Fchar_to_string, 1, 1, 0, /*
 Convert arg STRING to a character, the first character of that string.
 An empty string will return the constant `nil'.
 */
 (str))
 {
-Lisp_String *p;
+struct Lisp_String *p;
 CHECK_STRING (str);
 p = XSTRING (str);
 if (string_length (p) != 0)
 return make_char (string_char (p, 0));
 return make_int (BUF_SIZE (b));
 }
 DEFUN ("point-min", Fpoint_min, 0, 1, 0, /*
 Return the minimum permissible value of point in BUFFER.
-This is 1, unless narrowing (a buffer restriction)
+This is 1, unless narrowing (a buffer restriction) is in effect.
-is in effect, in which case it may be greater.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 return make_int (BUF_BEGV (b));
 }
 DEFUN ("point-min-marker", Fpoint_min_marker, 0, 1, 0, /*
 Return a marker to the minimum permissible value of point in BUFFER.
-This is the beginning, unless narrowing (a buffer restriction)
+This is the beginning, unless narrowing (a buffer restriction) is in effect.
-is in effect, in which case it may be greater.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 }
 DEFUN ("point-max", Fpoint_max, 0, 1, 0, /*
 Return the maximum permissible value of point in BUFFER.
 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)
-is in effect, in which case it may be less.
+is in effect, in which case it is less.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 return make_int (BUF_ZV (b));
 }
 DEFUN ("point-max-marker", Fpoint_max_marker, 0, 1, 0, /*
-Return a marker to the maximum permissible value of point in BUFFER.
+Return a marker to the maximum permissible value of point BUFFER.
 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)
-is in effect, in which case it may be less.
+is in effect, in which case it is less.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 return (BUF_PT (b) == BUF_ZV (b) || BUF_FETCH_CHAR (b, BUF_PT (b)) == '\n')
 ? Qt : Qnil;
 }
 DEFUN ("char-after", Fchar_after, 0, 2, 0, /*
-Return the character at position POS in BUFFER.
+Return character in BUFFER at position POS.
-POS is an integer or a marker.
+POS is an integer or a buffer pointer.
 If POS is out of range, the value is nil.
+If BUFFER is nil, the current buffer is assumed.
 if POS is nil, the value of point is assumed.
-If BUFFER is nil, the current buffer is assumed.
 */
 (pos, buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 Bufpos n = (NILP (pos) ? BUF_PT (b) :
 return Qnil;
 return make_char (BUF_FETCH_CHAR (b, n));
 }
 DEFUN ("char-before", Fchar_before, 0, 2, 0, /*
-Return the character preceding position POS in BUFFER.
+Return character in BUFFER before position POS.
-POS is an integer or a marker.
+POS is an integer or a buffer pointer.
 If POS is out of range, the value is nil.
+If BUFFER is nil, the current buffer is assumed.
 if POS is nil, the value of point is assumed.
-If BUFFER is nil, the current buffer is assumed.
 */
 (pos, buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
-Bufpos n = (NILP (pos) ? BUF_PT (b) :
+Bufpos n = ((NILP (pos) ? BUF_PT (b) :
-	      get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD));
+	       get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD)));
 n--;
 if (n < BUF_BEGV (b))
 return Qnil;
 }
 DEFUN ("temp-directory", Ftemp_directory, 0, 0, 0, /*
 Return the pathname to the directory to use for temporary files.
-On MS Windows, this is obtained from the TEMP or TMP environment variables,
+On NT/MSDOS, this is obtained from the TEMP or TMP environment variables,
 defaulting to / if they are both undefined.
 On Unix it is obtained from TMPDIR, with /tmp as the default
 */
 ())
 {
 char *tmpdir;
-#if defined(WIN32_NATIVE)
+#if defined(WINDOWSNT) || defined(MSDOS)
 tmpdir = getenv ("TEMP");
 if (!tmpdir)
 tmpdir = getenv ("TMP");
 if (!tmpdir)
 tmpdir = "/";
-#else /* WIN32_NATIVE */
+#else /* WINDOWSNT || MSDOS */
 tmpdir = getenv ("TMPDIR");
 if (!tmpdir)
 tmpdir = "/tmp";
 #endif
-return build_ext_string (tmpdir, Qfile_name);
+return build_ext_string (tmpdir, FORMAT_FILENAME);
 }
 DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
 Return the name under which the user logged in, as a string.
 This is based on the effective uid, not the real uid.
 ignored and this function returns the login name for that UID, or nil.
 */
 (uid))
 {
 char *returned_name;
-uid_t local_uid;
+int local_uid;
 if (!NILP (uid))
 {
 CHECK_INT (uid);
-local_uid = XINT (uid);
+local_uid = XINT(uid);
-returned_name = user_login_name (&local_uid);
+returned_name = user_login_name(&local_uid);
 }
 else
 {
-returned_name = user_login_name (NULL);
+returned_name = user_login_name(NULL);
 }
 /* #### - I believe this should return nil instead of "unknown" when pw==0
 pw=0 is indicated by a null return from user_login_name
 */
 return returned_name ? build_string (returned_name) : Qnil;
 reference.  If UID == NULL, then the USER name
 for the user running XEmacs will be returned.  This
 corresponds to a nil argument to Fuser_login_name.
 */
 char*
-user_login_name (uid_t *uid)
+user_login_name (int *uid)
 {
+struct passwd *pw = NULL;
 /* uid == NULL to return name of this user */
 if (uid != NULL)
 {
-struct passwd *pw = getpwuid (*uid);
+pw = getpwuid (*uid);
 return pw ? pw->pw_name : NULL;
 }
 else
 {
 /* #### - when euid != uid, then LOGNAME and USER are leftovers from the
 	 old environment (I site observed behavior on sunos and linux), so the
 	 environment variables should be disregarded in that case.  --Stig */
 char *user_name = getenv ("LOGNAME");
 if (!user_name)
 	user_name = getenv (
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 			    "USERNAME" /* it's USERNAME on NT */
 #else
 			    "USER"
 #endif
 			    );
 if (user_name)
 	return (user_name);
 else
 	{
-	  struct passwd *pw = getpwuid (geteuid ());
+	  pw = getpwuid (geteuid ());
-#ifdef CYGWIN
+#ifdef __CYGWIN32__
 	  /* Since the Cygwin environment may not have an /etc/passwd,
 	     return "unknown" instead of the null if the username
 	     cannot be determined.
 	  */
 	  return pw ? pw->pw_name : "unknown";
 ())
 {
 struct passwd *pw = getpwuid (getuid ());
 /* #### - I believe this should return nil instead of "unknown" when pw==0 */
+#ifdef MSDOS
+/* We let the real user name default to "root" because that's quite
+accurate on MSDOG and because it lets Emacs find the init file.
+(The DVX libraries override the Djgpp libraries here.)  */
+Lisp_Object tem = build_string (pw ? pw->pw_name : "root");/* no gettext */
+#else
 Lisp_Object tem = build_string (pw ? pw->pw_name : "unknown");/* no gettext */
+#endif
 return tem;
 }
 DEFUN ("user-uid", Fuser_uid, 0, 0, 0, /*
 Return the effective uid of Emacs, as an integer.
 return Vuser_full_name;
 user_name = (STRINGP (user) ? user : Fuser_login_name (user));
 if (!NILP (user_name))	/* nil when nonexistent UID passed as arg */
 {
-const char *user_name_ext;
+CONST char *user_name_ext;
 /* Fuck me.  getpwnam() can call select() and (under IRIX at least)
 	 things get wedged if a SIGIO arrives during this time. */
-TO_EXTERNAL_FORMAT (LISP_STRING, user_name,
+GET_C_STRING_OS_DATA_ALLOCA (user_name, user_name_ext);
-			  C_STRING_ALLOCA, user_name_ext,
-			  Qnative);
 slow_down_interrupts ();
 pw = (struct passwd *) getpwnam (user_name_ext);
 speed_up_interrupts ();
 }
 /* #### - Stig sez: this should return nil instead of "unknown" when pw==0 */
 /* Ben sez: bad idea because it's likely to break something */
 #ifndef AMPERSAND_FULL_NAME
-p = pw ? USER_FULL_NAME : "unknown"; /* don't gettext */
+p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */
 q = strchr (p, ',');
 #else
-p = pw ? USER_FULL_NAME : "unknown"; /* don't gettext */
+p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */
 q = strchr (p, ',');
 #endif
 tem = ((!NILP (user) && !pw)
 	 ? Qnil
 	 : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
-			    Qnative));
+			    FORMAT_OS));
 #ifdef AMPERSAND_FULL_NAME
 if (!NILP (tem))
 {
 p = (char *) XSTRING_DATA (tem);
 #endif /* AMPERSAND_FULL_NAME */
 return tem;
 }
-static Extbyte *cached_home_directory;
+static char *cached_home_directory;
 void
 uncache_home_directory (void)
 {
 cached_home_directory = NULL;	/* in some cases, this may cause the leaking
 				   of a few bytes */
 }
-/* !!#### not Mule correct. */
 /* Returns the home directory, in external format */
-Extbyte *
+char *
 get_home_directory (void)
 {
-/* !!#### this is hopelessly bogus.  Rule #1: Do not make any assumptions
-about what format an external string is in.  Could be Unicode, for all
-we know, and then all the operations below are totally bogus.
-Instead, convert all data to internal format *right* at the juncture
-between XEmacs and the outside world, the very moment we first get
-the data.  --ben */
 int output_home_warning = 0;
 if (cached_home_directory == NULL)
 {
-if ((cached_home_directory = (Extbyte *) getenv("HOME")) == NULL)
+if ((cached_home_directory = getenv("HOME")) == NULL)
 	{
-#if defined(WIN32_NATIVE)
+#if defined(WINDOWSNT) && !defined(__CYGWIN32__)
-	  char *homedrive, *homepath;
+	  char	*homedrive, *homepath;
 	  if ((homedrive = getenv("HOMEDRIVE")) != NULL &&
 	      (homepath = getenv("HOMEPATH")) != NULL)
 	    {
 	      cached_home_directory =
-		(Extbyte *) xmalloc (strlen (homedrive) +
+		(char *) xmalloc(strlen(homedrive) + strlen(homepath) + 1);
-				     strlen (homepath) + 1);
+	      sprintf(cached_home_directory, "%s%s", homedrive, homepath);
-	      sprintf((char *) cached_home_directory, "%s%s",
-		      homedrive,
-		      homepath);
 	    }
 	  else
 	    {
-# if 0 /* changed by ben.  This behavior absolutely stinks, and the
+# if 1
-	  possibility being addressed here occurs quite commonly.
-	  Using the current directory makes absolutely no sense. */
 	      /*
 	       * Use the current directory.
 	       * This preserves the existing XEmacs behavior, but is different
 	       * from NT Emacs.
 	       */
 	      if (initial_directory[0] != '\0')
 		{
-		  cached_home_directory = (Extbyte*) initial_directory;
+		  cached_home_directory = initial_directory;
 		}
 	      else
 		{
 		  /* This will probably give the wrong value */
-		  cached_home_directory = (Extbyte*) getcwd (NULL, 0);
+		  cached_home_directory = getcwd (NULL, 0);
 		}
 # else
 	      /*
 	       * This is NT Emacs behavior
 	       */
-	      cached_home_directory = (Extbyte *) "C:\\";
+	      cached_home_directory = "C:\\";
 	      output_home_warning = 1;
 # endif
 	    }
-#else	/* !WIN32_NATIVE */
+#else	/* !WINDOWSNT */
 	  /*
 	   * Unix, typically.
 	   * Using "/" isn't quite right, but what should we do?
 	   * We probably should try to extract pw_dir from /etc/passwd,
 	   * before falling back to this.
 	   */
-	  cached_home_directory = (Extbyte *) "/";
+	  cached_home_directory = "/";
 	  output_home_warning = 1;
-#endif	/* !WIN32_NATIVE */
+#endif	/* !WINDOWSNT */
 	}
 if (initialized && output_home_warning)
 	{
 	  warn_when_safe (Quser_files_and_directories, Qwarning, "\n"
 "	XEmacs was unable to determine a good value for the user's $HOME\n"
 DEFUN ("user-home-directory", Fuser_home_directory, 0, 0, 0, /*
 Return the user's home directory, as a string.
 */
 ())
 {
-Extbyte *path = get_home_directory ();
+char *path = get_home_directory ();
 return path == NULL ? Qnil :
 Fexpand_file_name (Fsubstitute_in_file_name
-		       (build_ext_string ((char *) path, Qfile_name)),
+		       (build_ext_string (path, FORMAT_FILENAME)),
 		       Qnil);
 }
 DEFUN ("system-name", Fsystem_name, 0, 0, 0, /*
 Return the name of the machine you are running on, as a string.
 */
 ())
 {
 return Fcopy_sequence (Vsystem_name);
+}
+/* For the benefit of callers who don't want to include lisp.h.
+Caller must free! */
+char *
+get_system_name (void)
+{
+return xstrdup ((char *) XSTRING_DATA (Vsystem_name));
 }
 DEFUN ("emacs-pid", Femacs_pid, 0, 0, 0, /*
 Return the process ID of Emacs, as an integer.
 */
 {
 unsigned int item = (unsigned int) the_time;
 return Fcons (make_int (item >> 16), make_int (item & 0xffff));
 }
-size_t emacs_strftime (char *string, size_t max, const char *format,
+size_t emacs_strftime (char *string, size_t max, CONST char *format,
-		       const struct tm *tm);
+		       CONST struct tm *tm);
-static long difftm (const struct tm *a, const struct tm *b);
+static long difftm (CONST struct tm *a, CONST struct tm *b);
 DEFUN ("format-time-string", Fformat_time_string, 1, 2, 0, /*
 Use FORMAT-STRING to format the time TIME.
 TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as from
 %M is replaced by the minute (00-59).
 %n is a synonym for "\\n".
 %p is replaced by AM or PM, as appropriate.
 %r is a synonym for "%I:%M:%S %p".
 %R is a synonym for "%H:%M".
-%s is replaced by the time in seconds since 00:00:00, Jan 1, 1970 (a
-nonstandard extension)
 %S is replaced by the second (00-60).
 %t is a synonym for "\\t".
 %T is a synonym for "%H:%M:%S".
 %U is replaced by the week of the year (00-53), first day of week is Sunday.
 %w is replaced by the day of week (0-6), Sunday is day 0.
 while (1)
 {
 char *buf = (char *) alloca (size);
 *buf = 1;
 if (emacs_strftime (buf, size,
-			  (const char *) XSTRING_DATA (format_string),
+			  (CONST char *) XSTRING_DATA (format_string),
 			  localtime (&value))
 	  || !*buf)
-	return build_ext_string (buf, Qbinary);
+	return build_ext_string (buf, FORMAT_BINARY);
 /* If buffer was too small, make it bigger.  */
 size *= 2;
 }
 }
 tem = (char *) ctime (&value);
 strncpy (buf, tem, 24);
 buf[24] = 0;
-return build_ext_string (buf, Qbinary);
+return build_ext_string (buf, FORMAT_BINARY);
 }
 #define TM_YEAR_ORIGIN 1900
 /* Yield A - B, measured in seconds.  */
 static long
-difftm (const struct tm *a, const struct tm *b)
+difftm (CONST struct tm *a, CONST struct tm *b)
 {
 int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
 int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
 /* Some compilers can't handle this as a single return statement.  */
 long days = (
 get_buffer_range_char (buf, start, end, &pos, &stop, 0);
 mc_count = begin_multiple_change (buf, pos, stop);
 if (STRINGP (table))
 {
-Lisp_String *stable = XSTRING (table);
+struct Lisp_String *stable = XSTRING (table);
 Charcount size = string_char_length (stable);
 #ifdef MULE
 /* Under Mule, string_char(n) is O(n), so for large tables or
 large regions it makes sense to create an array of Emchars.  */
 if (size * (stop - pos) > 65536)
 }
 else if (CHAR_TABLEP (table)
 	   && (XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_GENERIC
 	       || XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_CHAR))
 {
-Lisp_Char_Table *ctable = XCHAR_TABLE (table);
+struct Lisp_Char_Table *ctable = XCHAR_TABLE (table);
 for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++)
 	{
 	  Lisp_Object replacement = get_char_table (oc, ctable);
 	retry2:
 	  ? DOWNCASE (b, x1) == DOWNCASE (b, x2)
 	  : x1 == x2)
 ? Qt : Qnil;
 }
-DEFUN ("char=", Fchar_Equal, 2, 2, 0, /*
+DEFUN ("char=", Fchar_Equal, 2, 3, 0, /*
 Return t if two characters match, case is significant.
 Both arguments must be characters (i.e. NOT integers).
-*/
+The optional buffer argument is for symmetry and is ignored.
-(c1, c2))
+*/
+(c1, c2, buffer))
 {
 CHECK_CHAR_COERCE_INT (c1);
 CHECK_CHAR_COERCE_INT (c2);
-return EQ (c1, c2) ? Qt : Qnil;
+return XCHAR(c1) == XCHAR(c2) ? Qt : Qnil;
 }
 #if 0 /* Undebugged FSFmacs code */
 /* Transpose the markers in two regions of the current buffer, and
 adjust the ones between them if necessary (i.e.: if the regions

Mercurial > hg > xemacs-beta

comparison src/editfns.c @ 412:697ef44129c6 r21-2-14