xemacs-beta: src/editfns.c comparison

comparison src/editfns.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28

author	cvs
date	Mon, 13 Aug 2007 11:33:38 +0200
parents	9d177e8d4150
children	abe6d1db359e

comparison

equal deleted inserted replaced

-:357dd071b03c
+:8de8e3f6228a
 #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, FORMAT_OS);
+Vuser_full_name = build_ext_string (p, Qnative);
 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))
 {
-struct Lisp_String *p;
+Lisp_String *p;
 CHECK_STRING (str);
 p = XSTRING (str);
 if (string_length (p) != 0)
 return make_char (string_char (p, 0));
 tmpdir = getenv ("TMPDIR");
 if (!tmpdir)
 tmpdir = "/tmp";
 #endif
-return build_ext_string (tmpdir, FORMAT_FILENAME);
+return build_ext_string (tmpdir, Qfile_name);
 }
 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.
 {
 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. */
-GET_C_STRING_OS_DATA_ALLOCA (user_name, user_name_ext);
+TO_EXTERNAL_FORMAT (LISP_STRING, user_name,
+			  C_STRING_ALLOCA, user_name_ext,
+			  Qnative);
 slow_down_interrupts ();
 pw = (struct passwd *) getpwnam (user_name_ext);
 speed_up_interrupts ();
 }
 q = strchr (p, ',');
 #endif
 tem = ((!NILP (user) && !pw)
 	 ? Qnil
 	 : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
-			    FORMAT_OS));
+			    Qnative));
 #ifdef AMPERSAND_FULL_NAME
 if (!NILP (tem))
 {
 p = (char *) XSTRING_DATA (tem);
 #endif /* AMPERSAND_FULL_NAME */
 return tem;
 }
-static char *cached_home_directory;
+static Extbyte *cached_home_directory;
 void
 uncache_home_directory (void)
 {
 cached_home_directory = NULL;	/* in some cases, this may cause the leaking
 				   of a few bytes */
 }
 /* Returns the home directory, in external format */
-char *
+Extbyte *
 get_home_directory (void)
 {
 int output_home_warning = 0;
 if (cached_home_directory == NULL)
 {
-if ((cached_home_directory = getenv("HOME")) == NULL)
+if ((cached_home_directory = (Extbyte *) getenv("HOME")) == NULL)
 	{
 #if defined(WINDOWSNT) && !defined(__CYGWIN32__)
-	  char	*homedrive, *homepath;
+	  char *homedrive, *homepath;
 	  if ((homedrive = getenv("HOMEDRIVE")) != NULL &&
 	      (homepath = getenv("HOMEPATH")) != NULL)
 	    {
 	      cached_home_directory =
-		(char *) xmalloc(strlen(homedrive) + strlen(homepath) + 1);
+		(Extbyte *) xmalloc (strlen (homedrive) +
-	      sprintf(cached_home_directory, "%s%s", homedrive, homepath);
+				     strlen (homepath) + 1);
+	      sprintf((char *) cached_home_directory, "%s%s",
+		      homedrive,
+		      homepath);
 	    }
 	  else
 	    {
 # if 1
 	      /*
 		}
 # else
 	      /*
 	       * This is NT Emacs behavior
 	       */
-	      cached_home_directory = "C:\\";
+	      cached_home_directory = (Extbyte *) "C:\\";
 	      output_home_warning = 1;
 # endif
 	    }
 #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 = "/";
+	  cached_home_directory = (Extbyte *) "/";
 	  output_home_warning = 1;
 #endif	/* !WINDOWSNT */
 	}
 if (initialized && output_home_warning)
 	{
 DEFUN ("user-home-directory", Fuser_home_directory, 0, 0, 0, /*
 Return the user's home directory, as a string.
 */
 ())
 {
-char *path = get_home_directory ();
+Extbyte *path = get_home_directory ();
 return path == NULL ? Qnil :
 Fexpand_file_name (Fsubstitute_in_file_name
-		       (build_ext_string (path, FORMAT_FILENAME)),
+		       (build_ext_string ((char *) path, Qfile_name)),
 		       Qnil);
 }
 DEFUN ("system-name", Fsystem_name, 0, 0, 0, /*
 Return the name of the machine you are running on, as a string.
 *buf = 1;
 if (emacs_strftime (buf, size,
 			  (CONST char *) XSTRING_DATA (format_string),
 			  localtime (&value))
 	  || !*buf)
-	return build_ext_string (buf, FORMAT_BINARY);
+	return build_ext_string (buf, Qbinary);
 /* 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, FORMAT_BINARY);
+return build_ext_string (buf, Qbinary);
 }
 #define TM_YEAR_ORIGIN 1900
 /* Yield A - B, measured in seconds.  */
 get_buffer_range_char (buf, start, end, &pos, &stop, 0);
 mc_count = begin_multiple_change (buf, pos, stop);
 if (STRINGP (table))
 {
-struct Lisp_String *stable = XSTRING (table);
+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))
 {
-struct Lisp_Char_Table *ctable = XCHAR_TABLE (table);
+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:

Mercurial > hg > xemacs-beta

comparison src/editfns.c @ 440:8de8e3f6228a r21-2-28