diff options
| author | Paul Eggert | 1999-10-19 07:25:11 +0000 |
|---|---|---|
| committer | Paul Eggert | 1999-10-19 07:25:11 +0000 |
| commit | 68c45bf06516ed4650eb7f9f617742d84750600a (patch) | |
| tree | 8eed6fd2d1f6112b2bea449f86397ad0447836ab /src/coding.c | |
| parent | 0f0912e6442b71ed549b625bfc694581787da97e (diff) | |
| download | emacs-68c45bf06516ed4650eb7f9f617742d84750600a.tar.gz emacs-68c45bf06516ed4650eb7f9f617742d84750600a.zip | |
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.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 4bf0b2aea81..1e75be5ab6f 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -268,11 +268,14 @@ encode_coding_XXX (coding, source, destination, src_bytes, dst_bytes) | |||
| 268 | 268 | ||
| 269 | /*** 1. Preamble ***/ | 269 | /*** 1. Preamble ***/ |
| 270 | 270 | ||
| 271 | #ifdef emacs | ||
| 272 | #include <config.h> | ||
| 273 | #endif | ||
| 274 | |||
| 271 | #include <stdio.h> | 275 | #include <stdio.h> |
| 272 | 276 | ||
| 273 | #ifdef emacs | 277 | #ifdef emacs |
| 274 | 278 | ||
| 275 | #include <config.h> | ||
| 276 | #include "lisp.h" | 279 | #include "lisp.h" |
| 277 | #include "buffer.h" | 280 | #include "buffer.h" |
| 278 | #include "charset.h" | 281 | #include "charset.h" |
| @@ -357,6 +360,8 @@ Lisp_Object Vfile_coding_system_alist; | |||
| 357 | Lisp_Object Vprocess_coding_system_alist; | 360 | Lisp_Object Vprocess_coding_system_alist; |
| 358 | Lisp_Object Vnetwork_coding_system_alist; | 361 | Lisp_Object Vnetwork_coding_system_alist; |
| 359 | 362 | ||
| 363 | Lisp_Object Vlocale_coding_system; | ||
| 364 | |||
| 360 | #endif /* emacs */ | 365 | #endif /* emacs */ |
| 361 | 366 | ||
| 362 | Lisp_Object Qcoding_category, Qcoding_category_index; | 367 | Lisp_Object Qcoding_category, Qcoding_category_index; |
| @@ -5786,6 +5791,10 @@ or a cons of coding systems which are used as above.\n\ | |||
| 5786 | See also the function `find-operation-coding-system'."); | 5791 | See also the function `find-operation-coding-system'."); |
| 5787 | Vnetwork_coding_system_alist = Qnil; | 5792 | Vnetwork_coding_system_alist = Qnil; |
| 5788 | 5793 | ||
| 5794 | DEFVAR_LISP ("locale-coding-system", &Vlocale_coding_system, | ||
| 5795 | "Coding system to use with system messages."); | ||
| 5796 | Vlocale_coding_system = Qnil; | ||
| 5797 | |||
| 5789 | DEFVAR_LISP ("eol-mnemonic-unix", &eol_mnemonic_unix, | 5798 | DEFVAR_LISP ("eol-mnemonic-unix", &eol_mnemonic_unix, |
| 5790 | "*String displayed in mode line for UNIX-like (LF) end-of-line format."); | 5799 | "*String displayed in mode line for UNIX-like (LF) end-of-line format."); |
| 5791 | eol_mnemonic_unix = build_string (":"); | 5800 | eol_mnemonic_unix = build_string (":"); |
| @@ -5853,4 +5862,24 @@ The default value is `select-safe-coding-system' (which see)."); | |||
| 5853 | 5862 | ||
| 5854 | } | 5863 | } |
| 5855 | 5864 | ||
| 5865 | char * | ||
| 5866 | emacs_strerror (error_number) | ||
| 5867 | int error_number; | ||
| 5868 | { | ||
| 5869 | char *str; | ||
| 5870 | |||
| 5871 | synchronize_messages_locale (); | ||
| 5872 | str = strerror (error_number); | ||
| 5873 | |||
| 5874 | if (! NILP (Vlocale_coding_system)) | ||
| 5875 | { | ||
| 5876 | Lisp_Object dec = code_convert_string_norecord (build_string (str), | ||
| 5877 | Vlocale_coding_system, | ||
| 5878 | 0); | ||
| 5879 | str = (char *) XSTRING (dec)->data; | ||
| 5880 | } | ||
| 5881 | |||
| 5882 | return str; | ||
| 5883 | } | ||
| 5884 | |||
| 5856 | #endif /* emacs */ | 5885 | #endif /* emacs */ |