Mercurial > hg > xemacs-beta
view src/strftime.c @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | e38acbeb1cae |
children | 3d8143fc88e1 |
line wrap: on
line source
/* strftime - custom formatting of date and/or time Copyright (C) 1989, 1991, 1992 Free Software Foundation, Inc. This program 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 2, or (at your option) any later version. This program 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 this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30. */ /* This file has been ... uhhhhh ... Mule-ized. Yeah. (Everything here is external format. This is DANGEROUS and data-lossy, but fixing it is too much of a bother now.) --ben */ /* Note: this version of strftime lacks locale support, but it is standalone. Performs `%' substitutions similar to those in printf. Except where noted, substituted fields have a fixed size; numeric fields are padded if necessary. Padding is with zeros by default; for fields that display a single number, padding can be changed or inhibited by following the `%' with one of the modifiers described below. Unknown field specifiers are copied as normal characters. All other characters are copied to the output without change. Supports a superset of the ANSI C field specifiers. Literal character fields: % % n newline t tab Numeric modifiers (a nonstandard extension): - do not pad the field _ pad the field with spaces Time fields: %H hour (00..23) %I hour (01..12) %k hour ( 0..23) %l hour ( 1..12) %M minute (00..59) %p locale's AM or PM %r time, 12-hour (hh:mm:ss [AP]M) %R time, 24-hour (hh:mm) %s time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension) %S second (00..61) %T time, 24-hour (hh:mm:ss) %X locale's time representation (%H:%M:%S) %Z time zone (EDT), or nothing if no time zone is determinable Date fields: %a locale's abbreviated weekday name (Sun..Sat) %A locale's full weekday name, variable length (Sunday..Saturday) %b locale's abbreviated month name (Jan..Dec) %B locale's full month name, variable length (January..December) %c locale's date and time (Sat Nov 04 12:02:33 EST 1989) %C century (00..99) %d day of month (01..31) %e day of month ( 1..31) %D date (mm/dd/yy) %h same as %b %j day of year (001..366) %m month (01..12) %U week number of year with Sunday as first day of week (00..53) %w day of week (0..6) %W week number of year with Monday as first day of week (00..53) %x locale's date representation (mm/dd/yy) %y last two digits of year (00..99) %Y year (1970...) David MacKenzie <djm@gnu.ai.mit.edu> */ #ifdef HAVE_CONFIG_H #include <config.h> #include "lisp.h" #endif #include <stdio.h> #include <sys/types.h> #if defined(TM_IN_SYS_TIME) || (!defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)) #include <sys/time.h> #else #include <time.h> #endif #ifndef STDC_HEADERS time_t mktime (); #endif #if defined(WIN32_NATIVE) || defined(CYGWIN) #include <time.h> #else #if defined(HAVE_TZNAME) extern char *tzname[2]; #endif #endif /* WIN32_NATIVE */ #ifdef emacs #define strftime emacs_strftime #endif /* Types of padding for numbers in date and time. */ enum padding { none, blank, zero }; static char const* const days[] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; static char const * const months[] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; /* Add character C to STRING and increment LENGTH, unless LENGTH would exceed MAX. */ #define add_char(c) do \ { \ if (length + 1 <= max) \ string[length++] = (c); \ } while (0) /* Add a 2 digit number to STRING, padding if specified. Return the number of characters added, up to MAX. */ static int add_num2 (char *string, int num, int max, enum padding pad) { int top = num / 10; int length = 0; if (top == 0 && pad == blank) add_char (' '); else if (top != 0 || pad == zero) add_char (top + '0'); add_char (num % 10 + '0'); return length; } /* Add a 3 digit number to STRING, padding if specified. Return the number of characters added, up to MAX. */ static int add_num3 (char *string, int num, int max, enum padding pad) { int top = num / 100; int mid = (num - top * 100) / 10; int length = 0; if (top == 0 && pad == blank) add_char (' '); else if (top != 0 || pad == zero) add_char (top + '0'); if (mid == 0 && top == 0 && pad == blank) add_char (' '); else if (mid != 0 || top != 0 || pad == zero) add_char (mid + '0'); add_char (num % 10 + '0'); return length; } /* Like strncpy except return the number of characters copied. */ static int add_str (char *to, const char *from, int max) { int i; for (i = 0; from[i] && i <= max; ++i) to[i] = from[i]; return i; } static int add_num_time_t (char *string, int max, time_t num) { /* This buffer is large enough to hold the character representation (including the trailing NUL) of any unsigned decimal quantity whose binary representation fits in 128 bits. */ char buf[40]; if (sizeof (num) > 16) abort (); sprintf (buf, "%lu", (unsigned long) num); return add_str (string, buf, max); } /* Return the week in the year of the time in TM, with the weeks starting on Sundays. */ static int sun_week (const struct tm *tm) { int dl; /* Set `dl' to the day in the year of the last day of the week previous to the one containing the day specified in TM. If the day specified in TM is in the first week of the year, `dl' will be negative or 0. Otherwise, calculate the number of complete weeks before our week (dl / 7) and add any partial week at the start of the year (dl % 7). */ dl = tm->tm_yday - tm->tm_wday; return dl <= 0 ? 0 : dl / 7 + (dl % 7 != 0); } /* Return the week in the year of the time in TM, with the weeks starting on Mondays. */ static int mon_week (const struct tm *tm) { int dl, wday; if (tm->tm_wday == 0) wday = 6; else wday = tm->tm_wday - 1; dl = tm->tm_yday - wday; return dl <= 0 ? 0 : dl / 7 + (dl % 7 != 0); } #if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME) char *zone_name (const struct tm *tp); char * zone_name (const struct tm *tp) { char *timezone (); struct timeval tv; struct timezone tz; gettimeofday (&tv, &tz); return timezone (tz.tz_minuteswest, tp->tm_isdst); } #endif /* Format the time given in TM according to FORMAT, and put the results in STRING. Return the number of characters (not including terminating null) that were put into STRING, or 0 if the length would have exceeded MAX. */ size_t strftime (char *string, size_t max, const char *format, const struct tm *tm); size_t strftime (char *string, size_t max, const char *format, const struct tm *tm) { enum padding pad; /* Type of padding to apply. */ size_t length = 0; /* Characters put in STRING so far. */ for (; *format && length < max; ++format) { if (*format != '%') add_char (*format); else { ++format; /* Modifiers: */ if (*format == '-') { pad = none; ++format; } else if (*format == '_') { pad = blank; ++format; } else pad = zero; switch (*format) { /* Literal character fields: */ case 0: case '%': add_char ('%'); break; case 'n': add_char ('\n'); break; case 't': add_char ('\t'); break; default: add_char (*format); break; /* Time fields: */ case 'H': case 'k': length += add_num2 (&string[length], tm->tm_hour, max - length, *format == 'H' ? pad : blank); break; case 'I': case 'l': { int hour12; if (tm->tm_hour == 0) hour12 = 12; else if (tm->tm_hour > 12) hour12 = tm->tm_hour - 12; else hour12 = tm->tm_hour; length += add_num2 (&string[length], hour12, max - length, *format == 'I' ? pad : blank); } break; case 'M': length += add_num2 (&string[length], tm->tm_min, max - length, pad); break; case 'p': if (tm->tm_hour < 12) add_char ('A'); else add_char ('P'); add_char ('M'); break; case 'r': length += strftime (&string[length], max - length, "%I:%M:%S %p", tm); break; case 'R': length += strftime (&string[length], max - length, "%H:%M", tm); break; case 's': { struct tm writable_tm; writable_tm = *tm; length += add_num_time_t (&string[length], max - length, mktime (&writable_tm)); } break; case 'S': length += add_num2 (&string[length], tm->tm_sec, max - length, pad); break; case 'T': length += strftime (&string[length], max - length, "%H:%M:%S", tm); break; case 'X': length += strftime (&string[length], max - length, "%H:%M:%S", tm); break; case 'Z': #ifdef HAVE_TM_ZONE length += add_str (&string[length], tm->tm_zone, max - length); #else #ifdef HAVE_TZNAME if (tm->tm_isdst && tzname[1] && *tzname[1]) length += add_str (&string[length], tzname[1], max - length); else length += add_str (&string[length], tzname[0], max - length); #else length += add_str (&string[length], zone_name (tm), max - length); #endif #endif break; /* Date fields: */ case 'a': add_char (days[tm->tm_wday][0]); add_char (days[tm->tm_wday][1]); add_char (days[tm->tm_wday][2]); break; case 'A': length += add_str (&string[length], days[tm->tm_wday], max - length); break; case 'b': case 'h': add_char (months[tm->tm_mon][0]); add_char (months[tm->tm_mon][1]); add_char (months[tm->tm_mon][2]); break; case 'B': length += add_str (&string[length], months[tm->tm_mon], max - length); break; case 'c': length += strftime (&string[length], max - length, "%a %b %d %H:%M:%S %Z %Y", tm); break; case 'C': length += add_num2 (&string[length], (tm->tm_year + 1900) / 100, max - length, pad); break; case 'd': length += add_num2 (&string[length], tm->tm_mday, max - length, pad); break; case 'e': length += add_num2 (&string[length], tm->tm_mday, max - length, blank); break; case 'D': length += strftime (&string[length], max - length, "%m/%d/%y", tm); break; case 'j': length += add_num3 (&string[length], tm->tm_yday + 1, max - length, pad); break; case 'm': length += add_num2 (&string[length], tm->tm_mon + 1, max - length, pad); break; case 'U': length += add_num2 (&string[length], sun_week (tm), max - length, pad); break; case 'w': add_char (tm->tm_wday + '0'); break; case 'W': length += add_num2 (&string[length], mon_week (tm), max - length, pad); break; case 'x': length += strftime (&string[length], max - length, "%m/%d/%y", tm); break; case 'y': length += add_num2 (&string[length], tm->tm_year % 100, max - length, pad); break; case 'Y': add_char ((tm->tm_year + 1900) / 1000 + '0'); length += add_num3 (&string[length], (1900 + tm->tm_year) % 1000, max - length, zero); break; } } } add_char (0); return length - 1; }