[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs ntfstime.h,NONE,1.1 Makefile.am,1.7,1.8 timeconv.h,1.1,NONE

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20886/include/ntfs

Modified Files:
	Makefile.am 
Added Files:
	ntfstime.h 
Removed Files:
	timeconv.h 
Log Message:
Move timeconv to ntfstime, update changelog, and news for new release.


--- NEW FILE ---
/*
 * ntfstime.h - NTFS time related functions.  Part of the Linux-NTFS project.
 *
 * Copyright (c) 2005 Anton Altaparmakov
 * Copyright (c) 2005 Yura Pakhuchiy
 *
 * This program/include file 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 of the License, or
 * (at your option) any later version.
 *
 * This program/include file 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 (in the main directory of the Linux-NTFS
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef _NTFS_NTFSTIME_H
#define _NTFS_NTFSTIME_H

#include <time.h>

#include "types.h"

#define NTFS_TIME_OFFSET ((s64)(369 * 365 + 89) * 24 * 3600 * 10000000)

/**
 * ntfs2utc - Convert an NTFS time to Unix time
 * @ntfs_time:  An NTFS time in 100ns units since 1601
 *
 * NTFS stores times as the number of 100ns intervals since January 1st 1601 at
 * 00:00 UTC.  This system will not suffer from Y2K problems until ~57000AD.
 *
 * Return:  n  A Unix time (number of seconds since 1970)
 */
static __inline__ time_t ntfs2utc(s64 ntfs_time)
{
	return (ntfs_time - (NTFS_TIME_OFFSET)) / 10000000;
}

/**
 * utc2ntfs - Convert Linux time to NTFS time
 * @utc_time:  Linux time to convert to NTFS
 *
 * Convert the Linux time @utc_time to its corresponding NTFS time.
 *
 * Linux stores time in a long at present and measures it as the number of
 * 1-second intervals since 1st January 1970, 00:00:00 UTC.
 *
 * NTFS uses Microsoft's standard time format which is stored in a s64 and is
 * measured as the number of 100 nano-second intervals since 1st January 1601,
 * 00:00:00 UTC.
 *
 * Return:  n  An NTFS time (100ns units since Jan 1601)
 */
static __inline__ s64 utc2ntfs(time_t utc_time)
{
	/* Convert to 100ns intervals and then add the NTFS time offset. */
	return (s64)utc_time * 10000000 + NTFS_TIME_OFFSET;
}

#endif /* _NTFS_NTFSTIME_H */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- Makefile.am	29 Jul 2005 15:51:49 -0000	1.7
+++ Makefile.am	4 Aug 2005 09:59:41 -0000	1.8
@@ -26,7 +26,7 @@ linux_ntfsinclude_HEADERS = \
 	runlist.h		\
 	security.h		\
 	support.h		\
-	timeconv.h		\
+	ntfstime.h		\
 	types.h			\
 	unistr.h		\
 	volume.h

--- timeconv.h DELETED ---