|
From: Yura P. <cha...@us...> - 2005-07-20 19:07:33
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12661/include/ntfs Modified Files: Makefile.am Makefile.in inode.h Added Files: timeconv.h Log Message: - Move ntfs2utc and utc2ntfs from utils.[ch] to timeconv.h. - Add [acm]time fields to struct ntfs_inode and set them during ntfs_inode_open. Update ntfsmount to use them. - Bump version, update autoscripts. --- NEW FILE --- /* * timeconv.h - NTFS time conversion functions. Part of the Linux-NTFS project. * * 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_TIMECONV_H #define _NTFS_TIMECONV_H #include <time.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_TIMECONV_H */ Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- Makefile.am 4 Jun 2005 00:58:01 -0000 1.5 +++ Makefile.am 20 Jul 2005 19:06:47 -0000 1.6 @@ -26,6 +26,7 @@ linux_ntfsinclude_HEADERS = \ runlist.h \ security.h \ support.h \ + timeconv.h \ types.h \ unistr.h \ volume.h Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- Makefile.in 20 Jul 2005 08:15:24 -0000 1.29 +++ Makefile.in 20 Jul 2005 19:06:47 -0000 1.30 @@ -132,6 +132,7 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -202,6 +203,7 @@ linux_ntfsinclude_HEADERS = \ runlist.h \ security.h \ support.h \ + timeconv.h \ types.h \ unistr.h \ volume.h Index: inode.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- inode.h 19 Jun 2005 21:09:40 -0000 1.13 +++ inode.h 20 Jul 2005 19:06:47 -0000 1.14 @@ -139,9 +139,14 @@ struct _ntfs_inode { void *private_data; /* Temp: for directory handling */ int ref_count; - /* Belows fields needed to update indexes. They valid if != -1. */ + + /* Below 2 fields needed to update indexes. They valid if != -1. */ s64 data_size; s64 allocated_size; + + time_t atime; /* Last access to the data within the file. */ + time_t mtime; /* Last change of the data within the file. */ + time_t ctime; /* Last change of the metadata of the file. */ }; extern ntfs_inode *ntfs_inode_allocate(ntfs_volume *vol); |
