Ditch crummy fattime <--> timespec conversion functions
This commit is contained in:
Poul-Henning Kamp
parent
4a4cd136b4
commit
3c925ad2aa
@ -34,6 +34,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/clock.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/vnode.h>
|
||||
@ -52,58 +53,6 @@
|
||||
|
||||
MALLOC_DEFINE(M_SMBFSDATA, "smbfs_data", "SMBFS private data");
|
||||
|
||||
/*
|
||||
* Time & date conversion routines taken from msdosfs. Although leap
|
||||
* year calculation is bogus, it's sufficient before 2100 :)
|
||||
*/
|
||||
/*
|
||||
* This is the format of the contents of the deTime field in the direntry
|
||||
* structure.
|
||||
* We don't use bitfields because we don't know how compilers for
|
||||
* arbitrary machines will lay them out.
|
||||
*/
|
||||
#define DT_2SECONDS_MASK 0x1F /* seconds divided by 2 */
|
||||
#define DT_2SECONDS_SHIFT 0
|
||||
#define DT_MINUTES_MASK 0x7E0 /* minutes */
|
||||
#define DT_MINUTES_SHIFT 5
|
||||
#define DT_HOURS_MASK 0xF800 /* hours */
|
||||
#define DT_HOURS_SHIFT 11
|
||||
|
||||
/*
|
||||
* This is the format of the contents of the deDate field in the direntry
|
||||
* structure.
|
||||
*/
|
||||
#define DD_DAY_MASK 0x1F /* day of month */
|
||||
#define DD_DAY_SHIFT 0
|
||||
#define DD_MONTH_MASK 0x1E0 /* month */
|
||||
#define DD_MONTH_SHIFT 5
|
||||
#define DD_YEAR_MASK 0xFE00 /* year - 1980 */
|
||||
#define DD_YEAR_SHIFT 9
|
||||
/*
|
||||
* Total number of days that have passed for each month in a regular year.
|
||||
*/
|
||||
static u_short regyear[] = {
|
||||
31, 59, 90, 120, 151, 181,
|
||||
212, 243, 273, 304, 334, 365
|
||||
};
|
||||
|
||||
/*
|
||||
* Total number of days that have passed for each month in a leap year.
|
||||
*/
|
||||
static u_short leapyear[] = {
|
||||
31, 60, 91, 121, 152, 182,
|
||||
213, 244, 274, 305, 335, 366
|
||||
};
|
||||
|
||||
/*
|
||||
* Variables used to remember parts of the last time conversion. Maybe we
|
||||
* can avoid a full conversion.
|
||||
*/
|
||||
static u_long lasttime;
|
||||
static u_long lastday;
|
||||
static u_short lastddate;
|
||||
static u_short lastdtime;
|
||||
|
||||
void
|
||||
smb_time_local2server(struct timespec *tsp, int tzoff, u_long *seconds)
|
||||
{
|
||||
@ -145,112 +94,22 @@ void
|
||||
smb_time_unix2dos(struct timespec *tsp, int tzoff, u_int16_t *ddp,
|
||||
u_int16_t *dtp, u_int8_t *dhp)
|
||||
{
|
||||
u_long t, days, year, month, inc;
|
||||
u_short *months;
|
||||
struct timespec tt;
|
||||
u_long t;
|
||||
|
||||
/*
|
||||
* If the time from the last conversion is the same as now, then
|
||||
* skip the computations and use the saved result.
|
||||
*/
|
||||
tt = *tsp;
|
||||
smb_time_local2server(tsp, tzoff, &t);
|
||||
t &= ~1;
|
||||
if (lasttime != t) {
|
||||
lasttime = t;
|
||||
lastdtime = (((t / 2) % 30) << DT_2SECONDS_SHIFT)
|
||||
+ (((t / 60) % 60) << DT_MINUTES_SHIFT)
|
||||
+ (((t / 3600) % 24) << DT_HOURS_SHIFT);
|
||||
|
||||
/*
|
||||
* If the number of days since 1970 is the same as the last
|
||||
* time we did the computation then skip all this leap year
|
||||
* and month stuff.
|
||||
*/
|
||||
days = t / (24 * 60 * 60);
|
||||
if (days != lastday) {
|
||||
lastday = days;
|
||||
for (year = 1970;; year++) {
|
||||
inc = year & 0x03 ? 365 : 366;
|
||||
if (days < inc)
|
||||
break;
|
||||
days -= inc;
|
||||
}
|
||||
months = year & 0x03 ? regyear : leapyear;
|
||||
for (month = 0; days >= months[month]; month++)
|
||||
;
|
||||
if (month > 0)
|
||||
days -= months[month - 1];
|
||||
lastddate = ((days + 1) << DD_DAY_SHIFT)
|
||||
+ ((month + 1) << DD_MONTH_SHIFT);
|
||||
/*
|
||||
* Remember dos's idea of time is relative to 1980.
|
||||
* unix's is relative to 1970. If somehow we get a
|
||||
* time before 1980 then don't give totally crazy
|
||||
* results.
|
||||
*/
|
||||
if (year > 1980)
|
||||
lastddate += (year - 1980) << DD_YEAR_SHIFT;
|
||||
}
|
||||
}
|
||||
if (dtp)
|
||||
*dtp = lastdtime;
|
||||
if (dhp)
|
||||
*dhp = (tsp->tv_sec & 1) * 100 + tsp->tv_nsec / 10000000;
|
||||
|
||||
*ddp = lastddate;
|
||||
tt.tv_sec = t;
|
||||
timespec2fattime(&tt, 1, ddp, dtp, dhp);
|
||||
}
|
||||
|
||||
/*
|
||||
* The number of seconds between Jan 1, 1970 and Jan 1, 1980. In that
|
||||
* interval there were 8 regular years and 2 leap years.
|
||||
*/
|
||||
#define SECONDSTO1980 (((8 * 365) + (2 * 366)) * (24 * 60 * 60))
|
||||
|
||||
static u_short lastdosdate;
|
||||
static u_long lastseconds;
|
||||
|
||||
void
|
||||
smb_dos2unixtime(u_int dd, u_int dt, u_int dh, int tzoff,
|
||||
struct timespec *tsp)
|
||||
{
|
||||
u_long seconds;
|
||||
u_long month;
|
||||
u_long year;
|
||||
u_long days;
|
||||
u_short *months;
|
||||
|
||||
if (dd == 0) {
|
||||
tsp->tv_sec = 0;
|
||||
tsp->tv_nsec = 0;
|
||||
return;
|
||||
}
|
||||
seconds = (((dt & DT_2SECONDS_MASK) >> DT_2SECONDS_SHIFT) << 1)
|
||||
+ ((dt & DT_MINUTES_MASK) >> DT_MINUTES_SHIFT) * 60
|
||||
+ ((dt & DT_HOURS_MASK) >> DT_HOURS_SHIFT) * 3600
|
||||
+ dh / 100;
|
||||
/*
|
||||
* If the year, month, and day from the last conversion are the
|
||||
* same then use the saved value.
|
||||
*/
|
||||
if (lastdosdate != dd) {
|
||||
lastdosdate = dd;
|
||||
days = 0;
|
||||
year = (dd & DD_YEAR_MASK) >> DD_YEAR_SHIFT;
|
||||
days = year * 365;
|
||||
days += year / 4 + 1; /* add in leap days */
|
||||
if ((year & 0x03) == 0)
|
||||
days--; /* if year is a leap year */
|
||||
months = year & 0x03 ? regyear : leapyear;
|
||||
month = (dd & DD_MONTH_MASK) >> DD_MONTH_SHIFT;
|
||||
if (month < 1 || month > 12) {
|
||||
month = 1;
|
||||
}
|
||||
if (month > 1)
|
||||
days += months[month - 2];
|
||||
days += ((dd & DD_DAY_MASK) >> DD_DAY_SHIFT) - 1;
|
||||
lastseconds = (days * 24 * 60 * 60) + SECONDSTO1980;
|
||||
}
|
||||
smb_time_server2local(seconds + lastseconds, tzoff, tsp);
|
||||
tsp->tv_nsec = (dh % 100) * 10000000;
|
||||
fattime2timespec(dd, dt, dh, 1, tsp);
|
||||
smb_time_server2local(tsp->tv_sec, tzoff, tsp);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
Loading…
Reference in New Issue
Block a user