mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

update from main archive 961215

Browse Source 
Mon Dec 16 02:15:42 1996  Ulrich Drepper  <drepper@cygnus.com>

	Make sure tzset() sets always tzname[].
	* time/tzfile.c: De-ANSI-declfy.
	(find_transition): New function.  Set tzname according to given time.
	(__tzread_file): Use find_transition to set tzname.
	(__tzfile_compute): Use find_transition instead of doing the work
	self.
	* time/tzset.c (tzset): Set tzname[] directly only if !__use_tzfile.

Sun Dec 15 16:52:34 1996  Ulrich Drepper  <drepper@cygnus.com>

	* login/utmp-file.c (pututline_file): Open file if closed.
	Reported by Roma Ekzhanov <ekzhanov@paragraph.com>.
	Use fcntl instead of flock.

Sun Dec 15 14:20:51 1996  Ulrich Drepper  <drepper@cygnus.com>

	* manual/time.texi: Update documentation of strftime function.
This commit is contained in:
Ulrich Drepper 1996-12-16 01:40:21 +00:00
parent 68dbb3a69e
commit 860d372986
5 changed files with 123 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
Mon Dec 16 02:15:42 1996 Ulrich Drepper <drepper@cygnus.com>
Make sure tzset() sets always tzname[].
* time/tzfile.c: De-ANSI-declfy.
(find_transition): New function. Set tzname according to given time.
(__tzread_file): Use find_transition to set tzname.
(__tzfile_compute): Use find_transition instead of doing the work
self.
* time/tzset.c (tzset): Set tzname[] directly only if !__use_tzfile.
Sun Dec 15 16:52:34 1996 Ulrich Drepper <drepper@cygnus.com>
* login/utmp-file.c (pututline_file): Open file if closed.
Reported by Roma Ekzhanov <ekzhanov@paragraph.com>.
Use fcntl instead of flock.
Sun Dec 15 14:20:51 1996 Ulrich Drepper <drepper@cygnus.com>
* manual/time.texi: Update documentation of strftime function.
Sun Dec 15 01:53:20 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile (subdirs): Change crypt to md5-crypt.

29
login/utmp_file.c
View File

@ -140,14 +140,14 @@ getutent_r_file (struct utmp *buffer, struct utmp **result)
memset (&fl, '\0', sizeof (struct flock));
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
result = fcntl (file_fd, F_SETLKW, &fl);
fcntl (file_fd, F_SETLKW, &fl);
/* Read the next entry. */
nbytes = read (file_fd, &last_entry, sizeof (struct utmp));
/* And unlock the file. */
fl.l_type = F_UNLCK;
result = fcntl (file_fd, F_SETLKW, &fl);
fcntl (file_fd, F_SETLKW, &fl);
if (nbytes != sizeof (struct utmp))
{
@ -292,6 +292,7 @@ getutid_r_file (const struct utmp *id, struct utmp *buffer,
static struct utmp *
pututline_file (const struct utmp *data)
{
struct flock fl; /* Information struct for locking. */
struct utmp buffer;
struct utmp *pbuf;
int found;
@ -300,6 +301,10 @@ pututline_file (const struct utmp *data)
/* Something went wrong. */
return NULL;
if (file_fd == INT_MIN)
/* The file is closed. Open it again. */
setutent_file (0);
/* Find the correct place to insert the data. */
if (file_offset > 0)
found = 0;
@ -318,14 +323,10 @@ pututline_file (const struct utmp *data)
found = internal_getutid_r (data, &buffer);
/* Try to lock the file. */
if (flock (file_fd, LOCK_EX | LOCK_NB) < 0 && errno != ENOSYS)
{
/* Oh, oh. The file is already locked. Wait a bit and try again. */
sleep (1);
/* This time we ignore the error. */
(void) flock (file_fd, LOCK_EX | LOCK_NB);
}
memset (&fl, '\0', sizeof (struct flock));
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
fcntl (file_fd, F_SETLKW, &fl);
if (found < 0)
{
@ -338,8 +339,8 @@ pututline_file (const struct utmp *data)
if (lseek (file_fd, 0, SEEK_END) < 0)
{
(void) flock (file_fd, LOCK_UN);
return NULL;
pbuf = NULL;
goto unlock_return;
}
}
}
@ -365,8 +366,10 @@ pututline_file (const struct utmp *data)
pbuf = (struct utmp *) data;
}
unlock_return:
/* And unlock the file. */
(void) flock (file_fd, LOCK_UN);
fl.l_type = F_UNLCK;
fcntl (file_fd, F_SETLKW, &fl);
return pbuf;
}

21
manual/time.texi
View File

@ -638,14 +638,24 @@ The number is padded with spaces.
@item -
The number is not padded at all.
@item 0
The number is padded with zeros even if the format spefies padding
with spaces.
@end table
The default action is to pad the number with zeros to keep it a constant
width. Numbers that do not have a range indicated below are never
padded, since there is no natural width for them.
An optional modifier can follow the optional flag. The modifiers, which
are POSIX.2 extensions, are:
Following the flag an optional specification of the width is possible.
This is specified in decimal notation. If the natural size of the
output is of the field has less than the specifed number of character,
the result is written right adjusted and space padded to the given
size.
An optional modifier can follow the optional flag and width
specification. The modifiers, which are POSIX.2 extensions, are:
@table @code
@item E
@ -660,7 +670,8 @@ Use the locale's alternate numeric symbols for numbers. This modifier
applies only to numeric format specifiers.
@end table
A modifier is ignored if no alternate representation is available.
If the format supports the modifier but no alternate representation
is available, it is ignored.
The conversion specifier ends with a format specifier taken from the
following list. The whole @samp{%} sequence is replaced in the output
@ -868,6 +879,10 @@ repeat the call, providing a bigger array.
If @var{s} is a null pointer, @code{strftime} does not actually write
anything, but instead returns the number of characters it would have written.
According to POSIX.1 every call to @code{strftime} implies a call to
@code{tzset}. So the contents of the environment variable @code{TZ}
is examined before any output is produced.
For an example of @code{strftime}, see @ref{Time Functions Example}.
@end deftypefun

81
time/tzfile.c
View File

@ -12,11 +12,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <ansidecl.h>
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
@ -43,7 +42,8 @@ struct leap
long int change; /* Seconds of correction to apply. */
};
static void compute_tzname_max __P ((size_t));
static struct ttinfo *find_transition (time_t timer);
static void compute_tzname_max (size_t);
static size_t num_transitions;
static time_t *transitions = NULL;
@ -77,30 +77,31 @@ decode (const void *ptr)
}
void
DEFUN(__tzfile_read, (file), CONST char *file)
__tzfile_read (const char *file)
{
size_t num_isstd, num_isgmt;
register FILE *f;
struct tzhead tzhead;
size_t chars;
register size_t i;
struct ttinfo *info;
__use_tzfile = 0;
if (transitions != NULL)
free((PTR) transitions);
free ((void *) transitions);
transitions = NULL;
if (type_idxs != NULL)
free((PTR) type_idxs);
free ((void *) type_idxs);
type_idxs = NULL;
if (types != NULL)
free((PTR) types);
free ((void *) types);
types = NULL;
if (zone_names != NULL)
free((PTR) zone_names);
free ((void *) zone_names);
zone_names = NULL;
if (leaps != NULL)
free((PTR) leaps);
free ((void *) leaps);
leaps = NULL;
if (file == NULL)
@ -112,8 +113,8 @@ DEFUN(__tzfile_read, (file), CONST char *file)
if (*file != '/')
{
static CONST char tzdir[] = TZDIR;
register CONST unsigned int len = strlen(file) + 1;
static const char tzdir[] = TZDIR;
register const unsigned int len = strlen (file) + 1;
char *new = (char *) __alloca (sizeof (tzdir) + len);
memcpy (new, tzdir, sizeof(tzdir) - 1);
new[sizeof (tzdir) - 1] = '/';
@ -125,7 +126,7 @@ DEFUN(__tzfile_read, (file), CONST char *file)
if (f == NULL)
return;
if (fread((PTR) &tzhead, sizeof(tzhead), 1, f) != 1)
if (fread ((void *) &tzhead, sizeof (tzhead), 1, f) != 1)
goto lose;
num_transitions = (size_t) decode (tzhead.tzh_timecnt);
@ -166,8 +167,8 @@ DEFUN(__tzfile_read, (file), CONST char *file)
if (sizeof (time_t) < 4)
abort ();
if (fread((PTR) transitions, 4, num_transitions, f) != num_transitions ||
fread((PTR) type_idxs, 1, num_transitions, f) != num_transitions)
if (fread(transitions, 4, num_transitions, f) != num_transitions ||
fread(type_idxs, 1, num_transitions, f) != num_transitions)
goto lose;
if (BYTE_ORDER != BIG_ENDIAN || sizeof (time_t) != 4)
@ -184,23 +185,23 @@ DEFUN(__tzfile_read, (file), CONST char *file)
for (i = 0; i < num_types; ++i)
{
unsigned char x[4];
if (fread((PTR) x, 1, 4, f) != 4 ||
fread((PTR) &types[i].isdst, 1, 1, f) != 1 ||
fread((PTR) &types[i].idx, 1, 1, f) != 1)
if (fread (x, 1, 4, f) != 4 ||
fread (&types[i].isdst, 1, 1, f) != 1 ||
fread (&types[i].idx, 1, 1, f) != 1)
goto lose;
types[i].offset = (long int) decode (x);
}
if (fread((PTR) zone_names, 1, chars, f) != chars)
if (fread (zone_names, 1, chars, f) != chars)
goto lose;
for (i = 0; i < num_leaps; ++i)
{
unsigned char x[4];
if (fread((PTR) x, 1, sizeof(x), f) != sizeof(x))
if (fread (x, 1, sizeof (x), f) != sizeof (x))
goto lose;
leaps[i].transition = (time_t) decode (x);
if (fread((PTR) x, 1, sizeof(x), f) != sizeof(x))
if (fread (x, 1, sizeof (x), f) != sizeof (x))
goto lose;
leaps[i].change = (long int) decode (x);
}
@ -225,7 +226,14 @@ DEFUN(__tzfile_read, (file), CONST char *file)
while (i < num_types)
types[i++].isgmt = 0;
(void) fclose(f);
fclose (f);
info = find_transition (0);
for (i = 0; i < num_types && i < sizeof (__tzname) / sizeof (__tzname[0]);
++i)
__tzname[types[i].isdst] = &zone_names[types[i].idx];
if (info->isdst < sizeof (__tzname) / sizeof (__tzname[0]))
__tzname[info->isdst] = &zone_names[info->idx];
compute_tzname_max (chars);
@ -233,7 +241,7 @@ DEFUN(__tzfile_read, (file), CONST char *file)
return;
lose:;
(void) fclose(f);
fclose(f);
}
/* The user specified a hand-made timezone, but not its DST rules.
@ -241,9 +249,7 @@ DEFUN(__tzfile_read, (file), CONST char *file)
from the TZDEFRULES file. */
void
DEFUN(__tzfile_default, (std, dst, stdoff, dstoff),
char *std AND char *dst AND
long int stdoff AND long int dstoff)
__tzfile_default (char *std, char *dst, long int stdoff, long int dstoff)
{
size_t stdlen, dstlen, i;
long int rule_offset, rule_stdoff, rule_dstoff;
@ -332,12 +338,10 @@ DEFUN(__tzfile_default, (std, dst, stdoff, dstoff),
compute_tzname_max (stdlen + dstlen);
}
int
DEFUN(__tzfile_compute, (timer, leap_correct, leap_hit),
time_t timer AND long int *leap_correct AND int *leap_hit)
static struct ttinfo *
find_transition (time_t timer)
{
struct ttinfo *info;
register size_t i;
size_t i;
if (num_transitions == 0 || timer < transitions[0])
{
@ -360,7 +364,16 @@ DEFUN(__tzfile_compute, (timer, leap_correct, leap_hit),
i = type_idxs[i - 1];
}
info = &types[i];
return &types[i];
}
int
__tzfile_compute (time_t timer, long int *leap_correct, int *leap_hit)
{
struct ttinfo *info;
register size_t i;
info = find_transition (timer);
__daylight = info->isdst;
__timezone = info->offset;
for (i = 0; i < num_types && i < sizeof (__tzname) / sizeof (__tzname[0]);
@ -400,7 +413,7 @@ DEFUN(__tzfile_compute, (timer, leap_correct, leap_hit),
}
void
DEFUN(compute_tzname_max, (chars), size_t chars)
compute_tzname_max (size_t chars)
{
extern size_t __tzname_cur_max; /* Defined in __tzset.c. */

3
time/tzset.c
View File

@ -514,9 +514,12 @@ tzset (void)
__tzset ();
if (!__use_tzfile)
{
/* Set `tzname'. */
__tzname[0] = (char *) tz_rules[0].name;
__tzname[1] = (char *) tz_rules[1].name;
}
__libc_lock_unlock (__tzset_lock);
}