fb1b2af807
Upgrade of the tzcode from 2004a to 2009e. Changes are numerous, but include... - New format of the output of zic, which supports both 32 and 64 bit time_t formats. - zdump on 64 bit platforms will actually produce some output instead of doing nothing for a looooooooong time. - linux_base-fX, with X >= at least 8, will work without problems related to the local time again. The original patch, based on the 2008e, has been running for a long time on both my laptop and desktop machine and have been tested by other people. After the installation of this code and the running of zic(8), you need to run tzsetup(8) again to install the new datafile. Approved by: wollman@ for usr.sbin/zic MFC after: 1 month
92 lines
1.4 KiB
C
92 lines
1.4 KiB
C
/*
|
|
** This file is in the public domain, so clarified as of
|
|
** 2006-07-17 by Arthur David Olson.
|
|
*/
|
|
|
|
#ifndef lint
|
|
#ifndef NOID
|
|
static const char elsieid[] = "@(#)ialloc.c 8.30";
|
|
#endif /* !defined NOID */
|
|
#endif /* !defined lint */
|
|
|
|
#ifndef lint
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif /* not lint */
|
|
|
|
/*LINTLIBRARY*/
|
|
|
|
#include "private.h"
|
|
|
|
#define nonzero(n) (((n) == 0) ? 1 : (n))
|
|
|
|
char *
|
|
imalloc(n)
|
|
const int n;
|
|
{
|
|
return malloc((size_t) nonzero(n));
|
|
}
|
|
|
|
char *
|
|
icalloc(nelem, elsize)
|
|
int nelem;
|
|
int elsize;
|
|
{
|
|
if (nelem == 0 || elsize == 0)
|
|
nelem = elsize = 1;
|
|
return calloc((size_t) nelem, (size_t) elsize);
|
|
}
|
|
|
|
void *
|
|
irealloc(pointer, size)
|
|
void * const pointer;
|
|
const int size;
|
|
{
|
|
if (pointer == NULL)
|
|
return imalloc(size);
|
|
return realloc((void *) pointer, (size_t) nonzero(size));
|
|
}
|
|
|
|
char *
|
|
icatalloc(old, new)
|
|
char * const old;
|
|
const char * const new;
|
|
{
|
|
register char * result;
|
|
register int oldsize, newsize;
|
|
|
|
newsize = (new == NULL) ? 0 : strlen(new);
|
|
if (old == NULL)
|
|
oldsize = 0;
|
|
else if (newsize == 0)
|
|
return old;
|
|
else oldsize = strlen(old);
|
|
if ((result = irealloc(old, oldsize + newsize + 1)) != NULL)
|
|
if (new != NULL)
|
|
(void) strcpy(result + oldsize, new);
|
|
return result;
|
|
}
|
|
|
|
char *
|
|
icpyalloc(string)
|
|
const char * const string;
|
|
{
|
|
return icatalloc((char *) NULL, string);
|
|
}
|
|
|
|
void
|
|
ifree(p)
|
|
char * const p;
|
|
{
|
|
if (p != NULL)
|
|
(void) free(p);
|
|
}
|
|
|
|
void
|
|
icfree(p)
|
|
char * const p;
|
|
{
|
|
if (p != NULL)
|
|
(void) free(p);
|
|
}
|