Mercurial > emacs
view src/=environ.c @ 26088:b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
* Makefile.in (emacs): Set the LC_ALL environment variable to "C"
when dumping, so that the dumped Emacs doesn't have stray locale info.
(dired.o): Depend on systime.h.
(editfns.o): Depend on coding.h.
* alloc.c, buffer.c, callproc.c, ccl.c, charset.c, coding.c, data.c,
dispnew.c, editfns.c, emacs.c, filelock.c, floatfns.c, hftctl.c,
keyboard.c, process.c, sysdep.c, unexelf.c, unexhp9k800.c,
unexsunos4.c, vmsfns.c, vmsgmalloc.c, w32faces.c, w32menu.c, w32term.c,
w32xfns.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Include <config.h> before any system include files.
* alloc.c, buffer.c, ccl.c, data.c, editfns.c, emacs.c, eval.c,
fileio.c, filelock.c, frame.c, insdel.c, keymap.c, lread.c,
m/alpha.h, print.c, search.c, sysdep.c, xdisp.c, xfaces.c, xfns.c,
xmenu.c, xterm.c:
Do not include <stdlib.h>, as <config.h> does this now.
* callproc.c (Fcall_process):
Synchronize messages locale before invoking strerror.
Decode resulting string with locale-coding-system.
* coding.c (Vlocale_coding_system): New var.
(syms_of_coding): Adjust to above change.
(emacs_strerror): New function.
* coding.h (emacs_strerror, Vlocale_coding_system): New decls.
* config.in (HAVE_STDIO_EXT_H, HAVE_TM_GMTOFF, HAVE___FPENDING,
HAVE_FTELLO, HAVE_GETLOADAVG, HAVE_MBLEN, HAVE_MBRLEN,
HAVE_STRSIGNAL): New macros.
(BITS_PER_LONG): Default to 64 if _LP64 is defined.
<stdlib.h>: Include if HAVE_STDLIB_H is defined and NOT_C_CODE isn't.
* dired.c: Include "systime.h".
(Ffile_attributes): Do not cast s.st_size to int; this loses
information if int is 32 bits but st_size and EMACS_INT are larger.
Treat large device numbers like large inode numbers.
* dispnew.c (PENDING_OUTPUT_COUNT): Use __fpending if available.
* editfns.c: Include coding.h.
(emacs_strftime): Remove decl.
(emacs_strftimeu): New decl.
(emacs_memftimeu): Renamed from emacs_memftime; new arg UT.
Use emacs_strftimeu instead of emacs_strftime.
(Fformat_time_string): Convert format string using
Vlocale_coding_system, and convert result back. Synchronize time
locale before invoking lower level function. Invoke
emacs_memftimeu, passing ut, instead of emacs_memftime.
* emacs.c: Include <locale.h> if HAVE_SETLOCALE is defined.
(Vmessages_locale, Vprevious_messages_locale, Vtime_locale,
Vprevious_time_locale): New variables.
(main): Invoke setlocale early, so that initial error messages are
localized properly. But skip locale-setting if LC_ALL is "C".
Fix up locale when it's safe to do so.
(fixup_locale): Moved here from xterm.c.
(synchronize_locale, synchronize_time_locale,
synchronize_messages_locale): New functions.
(syms_of_emacs): Accommodate above changes.
* fileio.c (report_file_error): Convert strerror output according
to Vlocale_coding_system.
(Finsert_file_contents): Check for arithmetic overflow in
computations that depend on file size. Report IO errors
with emacs_strerror, not strerror.
* fns.c (Fgethash): Declare dflt parameter.
* gmalloc.c: Do not define const to nothing if HAVE_CONFIG_H
is defined; that's config.h's job.
* lisp.h (EMACS_INT, BITS_PER_EMACS_INT, EMACS_UINT): If _LP64,
default these values to long, BITS_PER_LONG, and unsigned long.
(VALBITS, MARKBIT, XINT): Do not assume 32-bit EMACS_INT.
(PNTR_COMPARISON_TYPE): Default to EMACS_UINT, not to unsigned int.
(code_convert_string_norecord, fixup_locale,
synchronize_messages_locale, synchronize_time_locale,
emacs_open, emacs_close, emacs_read, emacs_write): New decls.
All Emacs callers of open, close, read, write changed to use
emacs_open, emacs_close, emacs_read, emacs_write.
* lread.c (file_offset, file_tell): New macros. All uses of ftell
changed to file_tell.
(saved_doc_string_position, prev_saved_doc_string_position): Now
of type file_offset.
(init_lread): Do not fix locale here; fixup_locale now does this.
* m/amdahl.h, s/usg5-4.h:
(NSIG): Remove.
(NSIG_MINIMUM): New macro.
* m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h,
m/ustation.h, s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h,
s/umips.h, s/usg5-4.h:
(SIGIO): Do not undef.
(BROKEN_SIGIO): New macro.
* m/ustation.h:
(SIGTSTP): Do not undef.
(BROKEN_SIGTSTP): New macro.
* s/gnu-linux.h:
(SIGPOLL, SIGURG): Do not undef.
(BROKEN_SIGPOLL, BROKEN_SIGURG): New macros.
* s/ptx4.h:
(SIGINFO): Do not undef.
(BROKEN_SIGINFO): New macros.
* m/delta.h, s/ptx.h, s/template.h: Doc fix.
* mktime.c, strftime.c: Update to glibc 2.1.2 version, with
some Emacs-related changes merged.
* print.c (float_to_string): Prepend "-" to representation of a
NaN if the NaN is negative.
* process.c (sys_siglist): Omit if HAVE_STRSIGNAL.
(wait_reading_process_input): Use emacs_strerror, not strerror.
* process.c (status_message, sigchld_handler): Synchronize locale,
then use strsignal istead of sys_siglist.
* w32proc.c (sys_wait): Likewise.
* s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h,
s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h,
s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h,
s/usg5-2.h, s/usg5-3.h, s/xenix.h:
(open, close, read, write, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove.
* s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros.
* sysdep.c (sys_read, sys_write, read, write, sys_close, close,
sys_open, open): Remove.
(emacs_open, emacs_close, emacs_read, emacs_write): Always define;
the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO
macros are no longer used.
(emacs_open): Renamed from sys_open. Merge BSD4_1 version.
(emacs_close): Renamed from sys_close.
(emacs_read): Renamed from sys_read.
(emacs_write): Renamed from sys_write.
(sys_siglist): Do not declare if HAVE_STRSIGNAL.
(dup2): Do not print error on failure; the real dup2 doesn't.
(strsignal): New function, defined if !HAVE_STRSIGNAL.
* syssignal.h (SIGINFO): Undef if defined and if BROKEN_SIGINFO
is defined.
(SIGIO, SIGPOLL, SIGTSTP, SIGURG): Likewise.
(NSIG): If less than NSIG_MINIMUM, define to NSIG_MINIMUM.
(strsignal): Declare if !HAVE_STRSIGNAL.
* unexelf.c (ElfBitsW, ELFSIZE, ElfExpandBitsW): New macros.
(ElfW): Define in terms of ElfExpandBitsW.
* w32proc.c (sys_siglist): Remove decl.
* xdisp.c (decode_mode_spec): 3rd arg is int, not char, to comply
with ANSI C.
(display_string): Declare face_string_pos arg.
* xfns.c (Fx_show_tip): Declare timeout param.
* xterm.c: No need to include locale.h.
(x_alloc_lighter_color, x_setup_relief_color):
Pass arg as double, not float, for compatibility with ANSI C.
(fixup_locale): Move to emacs.c.
(x_term_init): Do not setlocale or fixup locale; the main program
does this now.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Tue, 19 Oct 1999 07:25:11 +0000 |
parents | c7c930b84dbb |
children |
line wrap: on
line source
/* Environment-hacking for GNU Emacs subprocess Copyright (C) 1986 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "config.h" #include "lisp.h" #ifdef MAINTAIN_ENVIRONMENT #ifdef VMS you lose -- this is un*x-only #endif /* alist of (name-string . value-string) */ Lisp_Object Venvironment_alist; extern char **environ; void set_environment_alist (str, val) register Lisp_Object str, val; { register Lisp_Object tem; tem = Fassoc (str, Venvironment_alist); if (NULL (tem)) if (NULL (val)) ; else Venvironment_alist = Fcons (Fcons (str, val), Venvironment_alist); else if (NULL (val)) Venvironment_alist = Fdelq (tem, Venvironment_alist); else XCONS (tem)->cdr = val; } static void initialize_environment_alist () { register unsigned char **e, *s; extern char *index (); for (e = (unsigned char **) environ; *e; e++) { s = (unsigned char *) index (*e, '='); if (s) set_environment_alist (make_string (*e, s - *e), build_string (s + 1)); } } unsigned char * getenv_1 (str, ephemeral) register unsigned char *str; int ephemeral; /* if ephmeral, don't need to gc-proof */ { register Lisp_Object env; int len = strlen (str); for (env = Venvironment_alist; CONSP (env); env = XCONS (env)->cdr) { register Lisp_Object car = XCONS (env)->car; register Lisp_Object tem = XCONS (car)->car; if ((len == XSTRING (tem)->size) && (!bcmp (str, XSTRING (tem)->data, len))) { /* Found it in the lisp environment */ tem = XCONS (car)->cdr; if (ephemeral) /* Caller promises that gc won't make him lose */ return XSTRING (tem)->data; else { register unsigned char **e; unsigned char *s; int ll = XSTRING (tem)->size; /* Look for element in the original unix environment */ for (e = (unsigned char **) environ; *e; e++) if (!bcmp (str, *e, len) && *(*e + len) == '=') { s = *e + len + 1; if (strlen (s) >= ll) /* User hasn't either hasn't munged it or has set it to something shorter -- we don't have to cons */ goto copy; else goto cons; }; cons: /* User has setenv'ed it to a diferent value, and our caller isn't guaranteeing that he won't stash it away somewhere. We can't just return a pointer to the lisp string, as that will be corrupted when gc happens. So, we cons (in such a way that it can't be freed -- though this isn't such a problem since the only callers of getenv (as opposed to those of egetenv) are very early, before the user -could- have frobbed the environment. */ s = (unsigned char *) xmalloc (ll + 1); copy: bcopy (XSTRING (tem)->data, s, ll + 1); return (s); } } } return ((unsigned char *) 0); } /* unsigned -- stupid delcaration in lisp.h */ char * getenv (str) register unsigned char *str; { return ((char *) getenv_1 (str, 0)); } unsigned char * egetenv (str) register unsigned char *str; { return (getenv_1 (str, 1)); } #if (1 == 1) /* use caller-alloca versions, rather than callee-malloc */ int size_of_current_environ () { register int size; Lisp_Object tem; tem = Flength (Venvironment_alist); size = (XINT (tem) + 1) * sizeof (unsigned char *); /* + 1 for environment-terminating 0 */ for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { register Lisp_Object str, val; str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; size += (XSTRING (str)->size + XSTRING (val)->size + 2); /* 1 for '=', 1 for '\000' */ } return size; } void get_current_environ (memory_block) unsigned char **memory_block; { register unsigned char **e, *s; register int len; register Lisp_Object tem; e = memory_block; tem = Flength (Venvironment_alist); s = (unsigned char *) memory_block + (XINT (tem) + 1) * sizeof (unsigned char *); for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { register Lisp_Object str, val; str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; *e++ = s; len = XSTRING (str)->size; bcopy (XSTRING (str)->data, s, len); s += len; *s++ = '='; len = XSTRING (val)->size; bcopy (XSTRING (val)->data, s, len); s += len; *s++ = '\000'; } *e = 0; } #else /* dead code (this function mallocs, caller frees) superseded by above (which allows caller to use alloca) */ unsigned char ** current_environ () { unsigned char **env; register unsigned char **e, *s; register int len, env_len; Lisp_Object tem; Lisp_Object str, val; tem = Flength (Venvironment_alist); env_len = (XINT (tem) + 1) * sizeof (char *); /* + 1 for terminating 0 */ len = 0; for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; len += (XSTRING (str)->size + XSTRING (val)->size + 2); } e = env = (unsigned char **) xmalloc (env_len + len); s = (unsigned char *) env + env_len; for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; *e++ = s; len = XSTRING (str)->size; bcopy (XSTRING (str)->data, s, len); s += len; *s++ = '='; len = XSTRING (val)->size; bcopy (XSTRING (val)->data, s, len); s += len; *s++ = '\000'; } *e = 0; return env; } #endif /* dead code */ DEFUN ("getenv", Fgetenv, Sgetenv, 1, 2, "sEnvironment variable: \np", "Return the value of environment variable VAR, as a string.\n\ When invoked interactively, print the value in the echo area.\n\ VAR is a string, the name of the variable,\n\ or the symbol t, meaning to return an alist representing the\n\ current environment.") (str, interactivep) Lisp_Object str, interactivep; { Lisp_Object val; if (str == Qt) /* If arg is t, return whole environment */ return (Fcopy_alist (Venvironment_alist)); CHECK_STRING (str, 0); val = Fcdr (Fassoc (str, Venvironment_alist)); if (!NULL (interactivep)) { if (NULL (val)) message ("%s not defined in environment", XSTRING (str)->data); else message ("\"%s\"", XSTRING (val)->data); } return val; } DEFUN ("setenv", Fsetenv, Ssetenv, 1, 2, "sEnvironment variable: \nsSet %s to value: ", "Set the value of environment variable VAR to VALUE.\n\ Both args must be strings. Returns VALUE.") (str, val) Lisp_Object str; Lisp_Object val; { Lisp_Object tem; CHECK_STRING (str, 0); if (!NULL (val)) CHECK_STRING (val, 0); set_environment_alist (str, val); return val; } syms_of_environ () { staticpro (&Venvironment_alist); defsubr (&Ssetenv); defsubr (&Sgetenv); } init_environ () { Venvironment_alist = Qnil; initialize_environment_alist (); } #endif /* MAINTAIN_ENVIRONMENT */