You can subscribe to this list here.
| 2001 |
Jan
(38) |
Feb
(25) |
Mar
(37) |
Apr
(50) |
May
|
Jun
(156) |
Jul
(174) |
Aug
(94) |
Sep
(107) |
Oct
(18) |
Nov
(153) |
Dec
(91) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(79) |
Feb
(117) |
Mar
(39) |
Apr
(164) |
May
(12) |
Jun
(64) |
Jul
(138) |
Aug
(43) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(17) |
Jun
(100) |
Jul
(210) |
Aug
(127) |
Sep
(89) |
Oct
(214) |
Nov
(176) |
Dec
(20) |
| 2006 |
Jan
(29) |
Feb
(85) |
Mar
(45) |
Apr
(54) |
May
(9) |
Jun
(7) |
Jul
(28) |
Aug
(65) |
Sep
(3) |
Oct
(62) |
Nov
(68) |
Dec
(52) |
| 2007 |
Jan
(6) |
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
(2) |
Jul
(4) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Anton A. <ai...@de...> - 2006-12-19 16:32:05
|
Changes by: aia21 Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs In directory delta357:/tmp/cvs-serv10137/include/ntfs Modified Files: unistr.h Log Message: - mkntfs: Create more Vista like volumes. We now match the security descriptor attributes (but not yet the security descriptors stored in $Secure). (Anton) - libntfs: Rewrite ntfs_upcase_table_build() to generate a Vista compatible upcase table ($UpCase). (Anton) - mkntfs: Remove own generation of upcase table, i.e. delete ntfsprogs/upcase.[ch] and use ntfs_upcase_table_build() supplied by libntfs. (Anton) Index: unistr.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/unistr.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- unistr.h 5 Apr 2006 02:45:56 -0000 1.9 +++ unistr.h 19 Dec 2006 16:31:52 -0000 1.10 @@ -2,7 +2,7 @@ * unistr.h - Exports for Unicode string handling. Part of the Linux-NTFS * project. * - * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2000-2006 Anton Altaparmakov * * 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 |
|
From: Yura P. <yu...@de...> - 2006-12-18 13:39:33
|
Changes by: yura Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv16886 Modified Files: autogen.sh Log Message: oops, committed temporary thing by accident hope this will work for everyone Index: autogen.sh =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/autogen.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- autogen.sh 18 Dec 2006 13:32:58 -0000 1.11 +++ autogen.sh 18 Dec 2006 13:39:23 -0000 1.12 @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash +#!/usr/bin/env bash # Run this to generate configure, Makefile.in's, etc if test "$srcdir" == ""; then |
|
From: Yura P. <yu...@de...> - 2006-12-18 13:33:10
|
Changes by: yura Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv16356 Modified Files: autogen.sh Log Message: add some debug output useful on freebsd for aligned access testing Index: autogen.sh =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/autogen.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- autogen.sh 27 Oct 2006 13:00:08 -0000 1.10 +++ autogen.sh 18 Dec 2006 13:32:58 -0000 1.11 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # Run this to generate configure, Makefile.in's, etc if test "$srcdir" == ""; then |
|
From: Yura P. <yu...@de...> - 2006-12-18 13:33:09
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv16356/ntfsprogs
Modified Files:
ntfsmount.c
Log Message:
add some debug output useful on freebsd for aligned access testing
Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- ntfsmount.c 6 Dec 2006 19:51:59 -0000 1.106
+++ ntfsmount.c 18 Dec 2006 13:32:58 -0000 1.107
@@ -165,8 +165,10 @@ static long ntfs_fuse_get_nr_free_mft_re
nr_free--;
}
free(buf);
- if (!total || br < 0)
+ if (!total || br < 0) {
+ ntfs_log_error("pread: %s\n", strerror(errno));
return -errno;
+ }
ctx->free_mft = nr_free;
ctx->state &= ~(NF_FreeMFTOutdate);
return nr_free;
@@ -197,8 +199,10 @@ static long ntfs_fuse_get_nr_free_cluste
nr_free--;
}
free(buf);
- if (!total || br < 0)
+ if (!total || br < 0) {
+ ntfs_log_error("pread: %s\n", strerror(errno));
return -errno;
+ }
ctx->free_clusters = nr_free;
ctx->state &= ~(NF_FreeClustersOutdate);
return nr_free;
|
|
From: Yura P. <yu...@de...> - 2006-12-15 17:00:14
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv2671/libntfs
Modified Files:
freebsd_io.c
Log Message:
- O_EXCL already handled by MNT_NOT_EXCLUSIVE at more early stage
- fix comments
Index: freebsd_io.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/freebsd_io.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freebsd_io.c 15 Dec 2006 15:21:27 -0000 1.1
+++ freebsd_io.c 15 Dec 2006 17:00:02 -0000 1.2
@@ -1,12 +1,12 @@
/**
- * freebsd_io.c - FreeBSD disk io functions. Originated from the Linux-NTFS
- * project.
+ * freebsd_io.c - FreeBSD disk io functions. Part of the Linux-NTFS project.
*
- * FreeBSD 5.0+ does not have character devices and requires
- * read/writes from/to block devices to be sector aligned.
+ * FreeBSD 5.0+ does not have block devices and requires read/writes from/to
+ * character devices to be sector aligned.
*
* Copyright (c) 2006 Max Khon
* Copyright (c) 2006 Anton Altaparmakov
+ * Copyright (c) 2006 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
@@ -177,15 +177,6 @@ static int ntfs_device_freebsd_io_open(s
DEV_FD(dev)->block_size = 0;
DEV_FD(dev)->media_size = 0;
- /*
- * Open file for exclusive access if mounting r/w.
- * Fuseblk takes care about block devices.
- * FIXME: This is totally wrong. ntfsmount needs to just disabled the
- * O_EXCL otherwise all other utilities are not mounting O_EXCL when
- * they definitely should be doing it!
- */
- if (!NDevBlock(dev) && (flags & O_RDWR) == O_RDWR)
- flags |= O_EXCL;
DEV_FD(dev)->fd = open(dev->d_name, flags);
if (DEV_FD(dev)->fd == -1) {
err = errno;
|
|
From: Anton A. <ai...@de...> - 2006-12-15 15:21:39
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv26304/libntfs
Modified Files:
device_io.c
Added Files:
freebsd_io.c
Log Message:
- libntfs: Add support for FreeBSD 5.0+ sector aligned access
requirements. (Max Khon)
With some modifications from me...
Index: device_io.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/device_io.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- device_io.c 26 Feb 2004 11:41:48 -0000 1.3
+++ device_io.c 15 Dec 2006 15:21:27 -0000 1.4
@@ -1,7 +1,7 @@
/*
* device_io.c - Default device io operations. Part of the Linux-NTFS project.
*
- * Copyright (c) 2003 Anton Altaparmakov
+ * Copyright (c) 2003-2006 Anton Altaparmakov
*
* 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
@@ -23,16 +23,24 @@
#ifndef NO_NTFS_DEVICE_DEFAULT_IO_OPS
-#ifndef __CYGWIN32__
-
-/* Not on Cygwin; use standard Unix style low level device operations. */
-#include "unix_io.c"
-
-#else /* __CYGWIN32__ */
+#if defined(__CYGWIN32__)
/* On Cygwin; use Win32 low level device operations. */
#include "win32_io.c"
-#endif /* __CYGWIN32__ */
+#elif defined(__FreeBSD__)
+
+/* On FreeBSD; need to use sector aligned i/o. */
+#include "freebsd_io.c"
+
+#else
+
+/*
+ * Not on Cygwin or FreeBSD; use standard Unix style low level device
+ * operations.
+ */
+#include "unix_io.c"
+
+#endif
#endif /* NO_NTFS_DEVICE_DEFAULT_IO_OPS */
--- NEW FILE ---
/**
* freebsd_io.c - FreeBSD disk io functions. Originated from the Linux-NTFS
* project.
*
* FreeBSD 5.0+ does not have character devices and requires
* read/writes from/to block devices to be sector aligned.
*
* Copyright (c) 2006 Max Khon
* Copyright (c) 2006 Anton Altaparmakov
*
* 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 NTFS-3G
* distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_LINUX_FD_H
#include <linux/fd.h>
#endif
#include <sys/disk.h>
#include "types.h"
#include "mst.h"
#include "debug.h"
#include "device.h"
#include "logging.h"
typedef struct {
int fd;
s64 pos;
s32 block_size;
s64 media_size;
} freebsd_fd;
#define DEV_FD(dev) (((freebsd_fd *) dev->d_private))
#define RAW_IO_ALIGNED(dev, offset, count) \
(DEV_FD(dev)->block_size == 0 || \
((offset) % DEV_FD(dev)->block_size == 0 && \
(count) % DEV_FD(dev)->block_size == 0))
#define RAW_IO_ALIGN(dev, offset) \
((offset) / DEV_FD(dev)->block_size * DEV_FD(dev)->block_size)
#define RAW_IO_MAX_SIZE (128 * 1024 * 1024)
/* Define to nothing if not present on this system. */
#ifndef O_EXCL
# define O_EXCL 0
#endif
/**
* Get block_size and media_size
*/
static int freebsd_get_size(struct ntfs_device *dev)
{
off_t ms;
int bs;
struct stat sb;
if (fstat(DEV_FD(dev)->fd, &sb) < 0) {
ntfs_log_perror("Failed to stat '%s'", dev->d_name);
return -1;
}
if (S_ISREG(sb.st_mode)) {
DEV_FD(dev)->media_size = sb.st_size;
ntfs_log_trace("%s: regular file (media_size %lld)\n",
dev->d_name, DEV_FD(dev)->media_size);
return 0;
}
if (ioctl(DEV_FD(dev)->fd, DIOCGSECTORSIZE, &bs) < 0) {
ntfs_log_perror("Failed to ioctl(DIOCGSECTORSIZE) '%s'",
dev->d_name);
return -1;
}
DEV_FD(dev)->block_size = bs;
ntfs_log_trace("%s: block size %d\n", dev->d_name, bs);
if (ioctl(DEV_FD(dev)->fd, DIOCGMEDIASIZE, &ms) < 0) {
ntfs_log_perror("Failed to ioctl(DIOCGMEDIASIZE) '%s'",
dev->d_name);
return -1;
}
DEV_FD(dev)->media_size = ms;
ntfs_log_trace("%s: media size %lld\n", dev->d_name, ms);
return 0;
}
/**
* freebsd_pread - Aligned read
*/
static inline ssize_t freebsd_pread(struct ntfs_device *dev, char *buf,
size_t count, s64 offset)
{
return pread(DEV_FD(dev)->fd, buf, count, offset);
}
/**
* freebsd_pwrite - Aligned write
*/
static inline ssize_t freebsd_pwrite(struct ntfs_device *dev, const char *buf,
size_t count, s64 offset)
{
return pwrite(DEV_FD(dev)->fd, buf, count, offset);
}
/**
* ntfs_device_freebsd_io_open - Open a device and lock it exclusively
* @dev:
* @flags:
*
* Description...
*
* Returns:
*/
static int ntfs_device_freebsd_io_open(struct ntfs_device *dev, int flags)
{
#if 0
struct flock flk;
#endif
struct stat sbuf;
int err;
if (NDevOpen(dev)) {
errno = EBUSY;
return -1;
}
if (stat(dev->d_name, &sbuf)) {
ntfs_log_perror("Failed to access '%s'", dev->d_name);
return -1;
}
if (S_ISBLK(sbuf.st_mode) || S_ISCHR(sbuf.st_mode))
NDevSetBlock(dev);
dev->d_private = malloc(sizeof(freebsd_fd));
if (!dev->d_private)
return -1;
DEV_FD(dev)->fd = -1;
DEV_FD(dev)->pos = 0;
DEV_FD(dev)->block_size = 0;
DEV_FD(dev)->media_size = 0;
/*
* Open file for exclusive access if mounting r/w.
* Fuseblk takes care about block devices.
* FIXME: This is totally wrong. ntfsmount needs to just disabled the
* O_EXCL otherwise all other utilities are not mounting O_EXCL when
* they definitely should be doing it!
*/
if (!NDevBlock(dev) && (flags & O_RDWR) == O_RDWR)
flags |= O_EXCL;
DEV_FD(dev)->fd = open(dev->d_name, flags);
if (DEV_FD(dev)->fd == -1) {
err = errno;
goto err_out;
}
if ((flags & O_RDWR) != O_RDWR)
NDevSetReadOnly(dev);
#if 0
memset(&flk, 0, sizeof(flk));
if (NDevReadOnly(dev))
flk.l_type = F_RDLCK;
else
flk.l_type = F_WRLCK;
flk.l_whence = SEEK_SET;
flk.l_start = flk.l_len = 0LL;
if (fcntl(DEV_FD(dev)->fd, F_SETLK, &flk)) {
err = errno;
ntfs_log_perror("Failed to %s lock '%s'", NDevReadOnly(dev) ?
"read" : "write", dev->d_name);
if (close(DEV_FD(dev)->fd))
ntfs_log_perror("Failed to close '%s'", dev->d_name);
goto err_out;
}
#endif
if (freebsd_get_size(dev) < 0) {
err = errno;
close(DEV_FD(dev)->fd);
goto err_out;
}
NDevSetOpen(dev);
return 0;
err_out:
free(dev->d_private);
dev->d_private = NULL;
errno = err;
return -1;
}
/**
* ntfs_device_freebsd_io_close - Close the device, releasing the lock
* @dev:
*
* Description...
*
* Returns:
*/
static int ntfs_device_freebsd_io_close(struct ntfs_device *dev)
{
#if 0
struct flock flk;
#endif
if (!NDevOpen(dev)) {
errno = EBADF;
return -1;
}
if (NDevDirty(dev))
fsync(DEV_FD(dev)->fd);
#if 0
/* Release exclusive (mandatory) lock on the whole device. */
memset(&flk, 0, sizeof(flk));
flk.l_type = F_UNLCK;
flk.l_whence = SEEK_SET;
flk.l_start = flk.l_len = 0LL;
if (fcntl(DEV_FD(dev)->fd, F_SETLK, &flk))
ntfs_log_perror("ntfs_device_freebsd_io_close: Warning: Could not "
"unlock %s", dev->d_name);
#endif
/* Close the file descriptor and clear our open flag. */
if (close(DEV_FD(dev)->fd))
return -1;
NDevClearOpen(dev);
free(dev->d_private);
dev->d_private = NULL;
return 0;
}
/**
* ntfs_device_freebsd_io_seek - Seek to a place on the device
* @dev:
* @offset:
* @whence:
*
* Description...
*
* Returns:
*/
static s64 ntfs_device_freebsd_io_seek(struct ntfs_device *dev, s64 offset,
int whence)
{
s64 abs_pos;
ntfs_log_trace("seek offset = 0x%llx, whence = %d.\n", offset, whence);
switch (whence) {
case SEEK_SET:
abs_pos = offset;
break;
case SEEK_CUR:
abs_pos = DEV_FD(dev)->pos + offset;
break;
case SEEK_END:
abs_pos = DEV_FD(dev)->media_size + offset;
break;
default:
ntfs_log_trace("Wrong mode %d.\n", whence);
errno = EINVAL;
return -1;
}
if (abs_pos < 0 || abs_pos > DEV_FD(dev)->media_size) {
ntfs_log_trace("Seeking outsize seekable area.\n");
errno = EINVAL;
return -1;
}
DEV_FD(dev)->pos = abs_pos;
return abs_pos;
}
/**
* ntfs_device_freebsd_io_read - Read from the device, from the current location
* @dev:
* @buf:
* @count:
*
* Description...
*
* Returns:
*/
static s64 ntfs_device_freebsd_io_read(struct ntfs_device *dev, void *buf,
s64 count)
{
s64 start, start_aligned;
s64 end, end_aligned;
size_t count_aligned;
char *buf_aligned;
ssize_t nr;
/* short-circuit for regular files */
start = DEV_FD(dev)->pos;
if (count > RAW_IO_MAX_SIZE)
count = RAW_IO_MAX_SIZE;
if (RAW_IO_ALIGNED(dev, start, count)) {
nr = freebsd_pread(dev, buf, count, start);
if (nr <= 0)
return nr;
DEV_FD(dev)->pos += nr;
return nr;
}
/*
* +- start_aligned +- end_aligned
* | |
* | +- start +- end |
* v v v v
* |----------|----------|----------|
* ^ ^
* +----- count ------+
* ^ ^
* +-------- count_aligned ---------+
*/
start_aligned = RAW_IO_ALIGN(dev, start);
end = start + count;
end_aligned = RAW_IO_ALIGN(dev, end) +
(RAW_IO_ALIGNED(dev, end, 0) ? 0 : DEV_FD(dev)->block_size);
count_aligned = end_aligned - start_aligned;
ntfs_log_trace(
"%s: count = 0x%llx/0x%x, start = 0x%llx/0x%llx, end = 0x%llx/0x%llx\n",
dev->d_name, count, count_aligned,
start, start_aligned, end, end_aligned);
/* allocate buffer */
buf_aligned = malloc(count_aligned);
if (buf_aligned == NULL) {
ntfs_log_trace("malloc(%d) failed\n", count_aligned);
return -1;
}
/* read aligned data */
nr = freebsd_pread(dev, buf_aligned, count_aligned, start_aligned);
if (nr == 0)
return 0;
if (nr < 0 || nr < start - start_aligned) {
free(buf_aligned);
return -1;
}
/* copy out */
memcpy(buf, buf_aligned + (start - start_aligned), count);
free(buf_aligned);
nr -= start - start_aligned;
if (nr > count)
nr = count;
DEV_FD(dev)->pos += nr;
return nr;
}
/**
* ntfs_device_freebsd_io_write - Write to the device, at the current location
* @dev:
* @buf:
* @count:
*
* Description...
*
* Returns:
*/
static s64 ntfs_device_freebsd_io_write(struct ntfs_device *dev, const void *buf,
s64 count)
{
s64 start, start_aligned;
s64 end, end_aligned;
size_t count_aligned;
char *buf_aligned;
ssize_t nw;
if (NDevReadOnly(dev)) {
errno = EROFS;
return -1;
}
NDevSetDirty(dev);
/* short-circuit for regular files */
start = DEV_FD(dev)->pos;
if (count > RAW_IO_MAX_SIZE)
count = RAW_IO_MAX_SIZE;
if (RAW_IO_ALIGNED(dev, start, count)) {
nw = freebsd_pwrite(dev, buf, count, start);
if (nw <= 0)
return nw;
DEV_FD(dev)->pos += nw;
return nw;
}
/*
* +- start_aligned +- end_aligned
* | |
* | +- start +- end |
* v v v v
* |----------|----------|----------|
* ^ ^
* +----- count ------+
* ^ ^
* +-------- count_aligned ---------+
*/
start_aligned = RAW_IO_ALIGN(dev, start);
end = start + count;
end_aligned = RAW_IO_ALIGN(dev, end) +
(RAW_IO_ALIGNED(dev, end, 0) ? 0 : DEV_FD(dev)->block_size);
count_aligned = end_aligned - start_aligned;
ntfs_log_trace(
"%s: count = 0x%llx/0x%x, start = 0x%llx/0x%llx, end = 0x%llx/0x%llx\n",
dev->d_name, count, count_aligned,
start, start_aligned, end, end_aligned);
/* allocate buffer */
buf_aligned = malloc(count_aligned);
if (buf_aligned == NULL) {
ntfs_log_trace("malloc(%d) failed\n", count_aligned);
return -1;
}
/* read aligned lead-in */
if (freebsd_pread(dev, buf_aligned, DEV_FD(dev)->block_size, start_aligned) != DEV_FD(dev)->block_size) {
ntfs_log_trace("read lead-in failed\n");
free(buf_aligned);
return -1;
}
/* read aligned lead-out */
if (end != end_aligned && count_aligned > DEV_FD(dev)->block_size) {
if (freebsd_pread(dev, buf_aligned + count_aligned - DEV_FD(dev)->block_size, DEV_FD(dev)->block_size, end_aligned - DEV_FD(dev)->block_size) != DEV_FD(dev)->block_size) {
ntfs_log_trace("read lead-out failed\n");
free(buf_aligned);
return -1;
}
}
/* copy data to write */
memcpy(buf_aligned + (start - start_aligned), buf, count);
/* write aligned data */
nw = freebsd_pwrite(dev, buf_aligned, count_aligned, start_aligned);
free(buf_aligned);
if (nw < 0 || nw < start - start_aligned)
return -1;
nw -= start - start_aligned;
if (nw > count)
nw = count;
DEV_FD(dev)->pos += nw;
return nw;
}
/**
* ntfs_device_freebsd_io_sync - Flush any buffered changes to the device
* @dev:
*
* Description...
*
* Returns:
*/
static int ntfs_device_freebsd_io_sync(struct ntfs_device *dev)
{
if (!NDevReadOnly(dev)) {
int res = fsync(DEV_FD(dev)->fd);
if (!res)
NDevClearDirty(dev);
return res;
}
return 0;
}
/**
* ntfs_device_freebsd_io_stat - Get information about the device
* @dev:
* @buf:
*
* Description...
*
* Returns:
*/
static int ntfs_device_freebsd_io_stat(struct ntfs_device *dev, struct stat *buf)
{
return fstat(DEV_FD(dev)->fd, buf);
}
/**
* ntfs_device_freebsd_io_ioctl - Perform an ioctl on the device
* @dev:
* @request:
* @argp:
*
* Description...
*
* Returns:
*/
static int ntfs_device_freebsd_io_ioctl(struct ntfs_device *dev, int request,
void *argp)
{
return ioctl(DEV_FD(dev)->fd, request, argp);
}
/**
* Device operations for working with unix style devices and files.
*/
struct ntfs_device_operations ntfs_device_unix_io_ops = {
.open = ntfs_device_freebsd_io_open,
.close = ntfs_device_freebsd_io_close,
.seek = ntfs_device_freebsd_io_seek,
.read = ntfs_device_freebsd_io_read,
.write = ntfs_device_freebsd_io_write,
.sync = ntfs_device_freebsd_io_sync,
.stat = ntfs_device_freebsd_io_stat,
.ioctl = ntfs_device_freebsd_io_ioctl,
};
|
|
From: Anton A. <ai...@de...> - 2006-12-15 15:21:38
|
Changes by: aia21 Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv26304 Modified Files: CREDITS ChangeLog TODO.libntfs Log Message: - libntfs: Add support for FreeBSD 5.0+ sector aligned access requirements. (Max Khon) With some modifications from me... Index: CREDITS =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/CREDITS,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- CREDITS 9 Dec 2006 14:01:12 -0000 1.29 +++ CREDITS 15 Dec 2006 15:21:27 -0000 1.30 @@ -19,6 +19,7 @@ Marcin GibuÅa <m.gibula at conecto.pl> Christophe Grenier <grenier at cgsecurity.org> Csaba Henk <csaba.henk at creo.hu> Ian Jackson <ian at davenant.greenend.org.uk> +Max Khon <fjoe at samodelkin.net> Carmelo Kintana <kintana at berkeley.edu> Jan Kratochvil <project-captive at jankratochvil.net> Lode Leroy <lode_leroy at hotmail.com> Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.432 retrieving revision 1.433 diff -u -p -r1.432 -r1.433 --- ChangeLog 13 Dec 2006 10:46:49 -0000 1.432 +++ ChangeLog 15 Dec 2006 15:21:27 -0000 1.433 @@ -115,6 +115,8 @@ xx/12/2006 - 2.0.0 - ntfsmount sports fu - mkntfs: As announced, remove the deprecated support for creation of NTFS 1.2/3.0 volumes. We now create NTFS 3.1 volumes only. (Anton) - mkntfs: Remove lots of unused/unneeded debugging code. (Anton) + - libntfs: Add support for FreeBSD 5.0+ sector aligned access + requirements. (Max Khon) 21/06/2006 - 1.13.1 - Various fixes. Index: TODO.libntfs =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/TODO.libntfs,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- TODO.libntfs 9 Mar 2006 14:13:18 -0000 1.22 +++ TODO.libntfs 15 Dec 2006 15:21:27 -0000 1.23 @@ -30,6 +30,9 @@ previous mount left the block size to larger value and we expect 512 bytes as that would be incredibly inefficient +- fix freebsd_io.c and win32_io.c to support device operations ->pread() and + ->pwrite() to improve their performance + ******************* * MEDIUM priority * ******************* |
|
From: Anton A. <ai...@de...> - 2006-12-15 14:53:01
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv22887/ntfsprogs
Modified Files:
mkntfs.c sd.c
Log Message:
Make volumes created with mkntfs more compliant with Vista (still not finished).
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- mkntfs.c 13 Dec 2006 10:46:49 -0000 1.154
+++ mkntfs.c 15 Dec 2006 14:52:43 -0000 1.155
@@ -1548,7 +1548,10 @@ static int insert_resident_attr_in_mft_r
a->length = cpu_to_le32(asize);
a->non_resident = 0;
a->name_length = name_len;
- a->name_offset = const_cpu_to_le16(24);
+ if (type == AT_OBJECT_ID)
+ a->name_offset = const_cpu_to_le16(0);
+ else
+ a->name_offset = const_cpu_to_le16(24);
a->flags = flags;
a->instance = m->next_attr_instance;
m->next_attr_instance = cpu_to_le16((le16_to_cpu(m->next_attr_instance)
Index: sd.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sd.c 13 Dec 2006 10:46:50 -0000 1.15
+++ sd.c 15 Dec 2006 14:52:43 -0000 1.16
@@ -44,9 +44,9 @@ void init_system_file_sd(int sys_file_no
sd->revision = 1;
sd->alignment = 0;
sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
- *sd_val_len = 0x68;
+ *sd_val_len = 0x64;
sd->owner = const_cpu_to_le32(0x48);
- sd->group = const_cpu_to_le32(0x58);
+ sd->group = const_cpu_to_le32(0x54);
sd->sacl = const_cpu_to_le32(0);
sd->dacl = const_cpu_to_le32(0x14);
/*
@@ -68,13 +68,12 @@ void init_system_file_sd(int sys_file_no
aa_ace->flags = 0;
aa_ace->size = const_cpu_to_le16(0x14);
switch (sys_file_no) {
- case FILE_MFT: case FILE_MFTMirr: case FILE_LogFile:
- case FILE_AttrDef: case FILE_Bitmap: case FILE_Boot:
- case FILE_BadClus: case FILE_UpCase:
+ case FILE_AttrDef:
+ case FILE_Boot:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_READ |
FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_READ_DATA;
break;
- case FILE_Volume: case FILE_Secure: case 0xb ... 0xffff:
+ default:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_WRITE |
FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES |
FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA |
@@ -103,17 +102,15 @@ void init_system_file_sd(int sys_file_no
aa_ace->type = ACCESS_ALLOWED_ACE_TYPE;
aa_ace->flags = 0;
aa_ace->size = const_cpu_to_le16(0x18);
+ /* Only $AttrDef and $Boot behave differently to everything else. */
switch (sys_file_no) {
- case FILE_MFT: case FILE_MFTMirr:
- case FILE_LogFile: case FILE_AttrDef:
- case FILE_Bitmap: case FILE_Boot:
- case FILE_BadClus: case FILE_UpCase:
+ case FILE_AttrDef:
+ case FILE_Boot:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_READ |
FILE_READ_ATTRIBUTES | FILE_READ_EA |
FILE_READ_DATA;
break;
- case FILE_Volume: case FILE_Secure:
- case 0xb ... 0xffff :
+ default:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_READ |
FILE_WRITE_ATTRIBUTES |
FILE_READ_ATTRIBUTES | FILE_WRITE_EA |
@@ -134,11 +131,13 @@ void init_system_file_sd(int sys_file_no
const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
aa_ace->sid.sub_authority[1] =
const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
- /* Now at offset 0x48 into the security descriptor. */
- /* As specified in the security descriptor, we now have the owner SID.*/
+ /*
+ * Now at offset 0x48 into the security descriptor, as specified in the
+ * security descriptor, we now have the owner SID.
+ */
sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
sid->revision = 1;
- sid->sub_authority_count = 2;
+ sid->sub_authority_count = 1;
/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
sid->identifier_authority.value[0] = 0;
sid->identifier_authority.value[1] = 0;
@@ -146,12 +145,10 @@ void init_system_file_sd(int sys_file_no
sid->identifier_authority.value[3] = 0;
sid->identifier_authority.value[4] = 0;
sid->identifier_authority.value[5] = 5;
- sid->sub_authority[0] = const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
- sid->sub_authority[1] = const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+ sid->sub_authority[0] = const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
/*
- * Now at offset 0x40 or 0x58 (root directory and the other system
- * files, respectively) into the security descriptor, as specified in
- * the security descriptor, we have the group SID.
+ * Now at offset 0x54 into the security descriptor, as specified in the
+ * security descriptor, we have the group SID.
*/
sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
sid->revision = 1;
@@ -168,7 +165,7 @@ void init_system_file_sd(int sys_file_no
}
/**
- * init_root_sd_31 (ERSO)
+ * init_root_sd_31
*
* creates the security_descriptor for the root folder on ntfs 3.1.
* It is very long; lots of ACE's at first, then large pieces of zeroes;
@@ -185,8 +182,8 @@ void init_root_sd_31(u8 **sd_val, int *s
ACCESS_ALLOWED_ACE *ace;
SID *sid;
- static char sd_array[0x1030];
- *sd_val_len = 0x1030;
+ static char sd_array[0x102c];
+ *sd_val_len = 0x102c;
*sd_val = (u8*)&sd_array;
//security descriptor relative
@@ -195,7 +192,7 @@ void init_root_sd_31(u8 **sd_val, int *s
sd->alignment = 0x00;
sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
sd->owner = const_cpu_to_le32(0x1014);
- sd->group = const_cpu_to_le32(0x1024);
+ sd->group = const_cpu_to_le32(0x1020);
sd->sacl = const_cpu_to_le32(0x00);
sd->dacl = const_cpu_to_le32(0x14);
@@ -349,7 +346,7 @@ void init_root_sd_31(u8 **sd_val, int *s
//owner sid
sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
sid->revision = 0x01;
- sid->sub_authority_count = 0x02;
+ sid->sub_authority_count = 0x01;
/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
sid->identifier_authority.value[0] = 0;
sid->identifier_authority.value[1] = 0;
@@ -357,8 +354,7 @@ void init_root_sd_31(u8 **sd_val, int *s
sid->identifier_authority.value[3] = 0;
sid->identifier_authority.value[4] = 0;
sid->identifier_authority.value[5] = 5;
- sid->sub_authority[0] = const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
- sid->sub_authority[1] = const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+ sid->sub_authority[0] = const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
//group sid
sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
|
|
From: Anton A. <ai...@de...> - 2006-12-13 10:51:38
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv2422/ntfsprogs
Modified Files:
ntfstruncate.c
Log Message:
Fix ntfstruncate build breakage.
Index: ntfstruncate.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ntfstruncate.c 12 Nov 2006 22:46:50 -0000 1.34
+++ ntfstruncate.c 13 Dec 2006 10:51:32 -0000 1.35
@@ -716,7 +716,7 @@ int main(int argc, char **argv)
* Setup a default $AttrDef. FIXME: Should be reading this from the
* volume itself, at ntfs_mount() time.
*/
- attr_defs = (ATTR_DEF*)&attrdef_ntfs12_array;
+ attr_defs = (ATTR_DEF*)&attrdef_ntfs3x_array;
/* Parse command line options. */
parse_options(argc, argv);
@@ -808,4 +808,3 @@ int main(int argc, char **argv)
ntfs_log_quiet("ntfstruncate completed successfully. Have a nice day.\n");
return 0;
}
-
|
|
From: Anton A. <ai...@de...> - 2006-12-13 10:46:58
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv1960/ntfsprogs
Modified Files:
attrdef.c attrdef.h mkntfs.8.in mkntfs.c sd.c sd.h
Log Message:
Update version to 2.0.0, update NEWS, update mkntfs man page and mkntfs itself.
- mkntfs: As announced, remove the deprecated support for creation of
NTFS 1.2/3.0 volumes. We now create NTFS 3.1 volumes only. (Anton)
- mkntfs: Remove lots of unused/unneeded debugging code. (Anton)
Index: attrdef.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/attrdef.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- attrdef.c 12 Dec 2006 19:00:01 -0000 1.6
+++ attrdef.c 13 Dec 2006 10:46:49 -0000 1.7
@@ -1,162 +1,6 @@
#include "attrdef.h"
/**
- * attrdef_ntfs12_array
- */
-const unsigned char attrdef_ntfs12_array[2400] = {
- 36, 0, 83, 0, 84, 0, 65, 0, 78, 0, 68, 0, 65, 0, 82, 0,
- 68, 0, 95, 0, 73, 0, 78, 0, 70, 0, 79, 0, 82, 0, 77, 0,
- 65, 0, 84, 0, 73, 0, 79, 0, 78, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
- 48, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0,
- 36, 0, 65, 0, 84, 0, 84, 0, 82, 0, 73, 0, 66, 0, 85, 0,
- 84, 0, 69, 0, 95, 0, 76, 0, 73, 0, 83, 0, 84, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 70, 0, 73, 0, 76, 0, 69, 0, 95, 0, 78, 0, 65, 0,
- 77, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0,
- 68, 0, 0, 0, 0, 0, 0, 0, 66, 2, 0, 0, 0, 0, 0, 0,
- 36, 0, 86, 0, 79, 0, 76, 0, 85, 0, 77, 0, 69, 0, 95, 0,
- 86, 0, 69, 0, 82, 0, 83, 0, 73, 0, 79, 0, 78, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
- 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
- 36, 0, 83, 0, 69, 0, 67, 0, 85, 0, 82, 0, 73, 0, 84, 0,
- 89, 0, 95, 0, 68, 0, 69, 0, 83, 0, 67, 0, 82, 0, 73, 0,
- 80, 0, 84, 0, 79, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 86, 0, 79, 0, 76, 0, 85, 0, 77, 0, 69, 0, 95, 0,
- 78, 0, 65, 0, 77, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
- 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 36, 0, 86, 0, 79, 0, 76, 0, 85, 0, 77, 0, 69, 0, 95, 0,
- 73, 0, 78, 0, 70, 0, 79, 0, 82, 0, 77, 0, 65, 0, 84, 0,
- 73, 0, 79, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
- 12, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
- 36, 0, 68, 0, 65, 0, 84, 0, 65, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 73, 0, 78, 0, 68, 0, 69, 0, 88, 0, 95, 0, 82, 0,
- 79, 0, 79, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 73, 0, 78, 0, 68, 0, 69, 0, 88, 0, 95, 0, 65, 0,
- 76, 0, 76, 0, 79, 0, 67, 0, 65, 0, 84, 0, 73, 0, 79, 0,
- 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 66, 0, 73, 0, 84, 0, 77, 0, 65, 0, 80, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 83, 0, 89, 0, 77, 0, 66, 0, 79, 0, 76, 0, 73, 0,
- 67, 0, 95, 0, 76, 0, 73, 0, 78, 0, 75, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
- 36, 0, 69, 0, 65, 0, 95, 0, 73, 0, 78, 0, 70, 0, 79, 0,
- 82, 0, 77, 0, 65, 0, 84, 0, 73, 0, 79, 0, 78, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
- 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
- 36, 0, 69, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/**
* attrdef_ntfs3x_array
*/
const unsigned char attrdef_ntfs3x_array[2560] = {
Index: attrdef.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/attrdef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- attrdef.h 21 Oct 2005 18:08:28 -0000 1.1
+++ attrdef.h 13 Dec 2006 10:46:49 -0000 1.2
@@ -1,7 +1,6 @@
#ifndef _NTFS_ATTRDEF_H_
#define _NTFS_ATTRDEF_H_
-extern const unsigned char attrdef_ntfs12_array[2400];
extern const unsigned char attrdef_ntfs3x_array[2560];
#endif /* _NTFS_ATTRDEF_H_ */
Index: mkntfs.8.in
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mkntfs.8.in 13 Dec 2006 00:11:50 -0000 1.26
+++ mkntfs.8.in 13 Dec 2006 10:46:49 -0000 1.27
@@ -45,10 +45,6 @@ mkntfs \- create an NTFS file system
.B \-n
]
[
-.B \-N
-.I ntfs\-version
-]
-[
.B \-p
.I part\-start\-sect
]
@@ -123,6 +119,14 @@ Set the volume label for the filesystem.
\fB\-C\fR, \fB\-\-enable\-compression\fR
Enable compression on the volume.
.TP
+\fB\-n\fR, \fB\-\-no\-action\fR
+Causes
+.B mkntfs
+to not actually create a filesystem, but display what it would do if it were
+to create a filesystem. All steps of the format are carried out except the
+actual writing to the device.
+.SS Advanced options
+.TP
\fB\-c\fR, \fB\-\-cluster\-size\fR BYTES
Specify the size of clusters in bytes. Valid cluster size values are powers of
two, with at least 256, and at most 65536 bytes per cluster. If omitted,
@@ -135,22 +139,6 @@ greater than 4096 have the side effect t
volume (due to limitations in the NTFS compression algorithm currently in use
by Windows).
.TP
-\fB\-N\fR, \fB\-\-ntfs\-version\fR STRING
-Select the version of NTFS you wish to create. This can be "1.2"
-(Windows NT 4.0) or "3.1" (Windows XP, Server 2003, and Vista).
-Versions are upwards compatible and Windows 2000, which uses version "3.0",
-can read/write both.
-
-If this option is omitted then version "3.1" is used.
-.TP
-\fB\-n\fR, \fB\-\-no\-action\fR
-Causes
-.B mkntfs
-to not actually create a filesystem, but display what it would do if it were
-to create a filesystem. All steps of the format are carried out except the
-actual writing to the device.
-.SS Advanced options
-.TP
\fB\-s\fR, \fB\-\-sector\-size\fR BYTES
Specify the size of sectors in bytes. Valid sector size values are 256, 512,
1024, 2048 and 4096 bytes per sector. If omitted,
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- mkntfs.c 13 Dec 2006 09:17:14 -0000 1.153
+++ mkntfs.c 13 Dec 2006 10:46:49 -0000 1.154
@@ -206,8 +206,6 @@ static struct mkntfs_options {
long mft_zone_multiplier; /* -z, value from 1 to 4. Default is 1. */
long long num_sectors; /* size of device in sectors */
long cluster_size; /* -c, format with this cluster-size */
- u8 ver_major; /* -N, ntfs version to create */
- u8 ver_minor;
char *label; /* -L, volume label */
} opts;
@@ -232,18 +230,17 @@ static void mkntfs_usage(void)
" -Q, --quick Perform a quick format\n"
" -L, --label STRING Set the volume label\n"
" -C, --enable-compression Enable compression on the volume\n"
- " -c, --cluster-size BYTES Specify the cluster size for the volume\n"
" -I, --no-indexing Disable indexing on the volume\n"
" -n, --no-action Do not write to disk\n"
"\n"
"Advanced options:\n"
+ " -c, --cluster-size BYTES Specify the cluster size for the volume\n"
" -s, --sector-size BYTES Specify the sector size for the device\n"
" -p, --partition-start SECTOR Specify the partition start sector\n"
" -H, --heads NUM Specify the number of heads\n"
" -S, --sectors-per-track NUM Specify the number of sectors per track\n"
" -z, --mft-zone-multiplier NUM Set the MFT zone multiplier\n"
" -T, --zero-time Fake the time to be 00:00 UTC, Jan 1, 1970\n"
- " -N, --ntfs-version VERSION NTFS version: 3.1 (default) or 1.2 (old)\n"
" -F, --force Force execution despite errors\n"
"\n"
"Output options:\n"
@@ -351,7 +348,7 @@ static void mkntfs_init_options(struct m
*/
static BOOL mkntfs_parse_options(int argc, char *argv[], struct mkntfs_options *opts2)
{
- static const char *sopt = "-c:CfFhH:IlL:nN:p:qQs:S:TvVz:";
+ static const char *sopt = "-c:CfFhH:IlL:np:qQs:S:TvVz:";
static const struct option lopt[] = {
{ "cluster-size", required_argument, NULL, 'c' },
{ "debug", no_argument, NULL, 'Z' },
@@ -365,7 +362,6 @@ static BOOL mkntfs_parse_options(int arg
{ "mft-zone-multiplier",required_argument, NULL, 'z' },
{ "no-action", no_argument, NULL, 'n' },
{ "no-indexing", no_argument, NULL, 'I' },
- { "ntfs-version", required_argument, NULL, 'N' },
{ "partition-start", required_argument, NULL, 'p' },
{ "quick", no_argument, NULL, 'Q' },
{ "quiet", no_argument, NULL, 'q' },
@@ -435,28 +431,6 @@ static BOOL mkntfs_parse_options(int arg
case 'n':
opts2->no_action = TRUE;
break;
- case 'N': /* ntfs-version */
- if ((opts2->ver_major == 0) && (opts2->ver_minor == 0)) {
- if (strcmp(optarg , "1.2") == 0) {
- opts2->ver_major = 1;
- opts2->ver_minor = 2;
-/*
- FIXME: version 3.0 was not checked
- } else if (strcmp(optarg , "3.0") == 0) {
- opts2->ver_major = 3;
- opts2->ver_minor = 0;
-*/ } else if (strcmp(optarg , "3.1") == 0) {
- opts2->ver_major = 3;
- opts2->ver_minor = 1;
- } else {
- ntfs_log_error("NTFS version '%s' is invalid.\n", optarg);
- err++;
- }
- } else {
- ntfs_log_error("You may only specify the NTFS version once.\n");
- err++;
- }
- break;
case 'p':
if (!mkntfs_parse_llong(optarg, "partition start", &opts2->part_start_sect))
err++;
@@ -679,373 +653,6 @@ static s64 ntfs_rlwrite(struct ntfs_devi
return total;
}
-
-/**
- * dump_resident_attr_val
- */
-static void dump_resident_attr_val(ATTR_TYPES type, char *val, u32 val_len)
-{
- const char *don_t_know = "Don't know what to do with this attribute "
- "type yet.";
- const char *skip = "Skipping display of $%s attribute value.\n";
- const char *todo = "This is still work in progress.";
- char *b = NULL;
- int i, j;
-
- switch (type) {
- case AT_STANDARD_INFORMATION:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_ATTRIBUTE_LIST:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_FILE_NAME:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_OBJECT_ID:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_SECURITY_DESCRIPTOR:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_VOLUME_NAME:
- printf("Volume name length = %i\n", (unsigned int)val_len);
- if (val_len) {
- i = ntfs_ucstombs((ntfschar*)val, val_len, &b, 0);
- if (i < 0)
- printf("Volume name contains non-displayable "
- "Unicode characters.\n");
- printf("Volume name = %s\n", b);
- free(b);
- }
- return;
- case AT_VOLUME_INFORMATION:
-#define VOL_INF(x) ((VOLUME_INFORMATION *)(x))
- printf("NTFS version %i.%i\n", VOL_INF(val)->major_ver,
- VOL_INF(val)->minor_ver);
- i = VOL_INF(val)->flags;
-#undef VOL_INF
- printf("Volume flags = 0x%x: ", i);
- if (!i) {
- printf("NONE\n");
- return;
- }
- j = 0;
- if (i & VOLUME_MODIFIED_BY_CHKDSK) {
- printf("VOLUME_MODIFIED_BY_CHKDSK");
- j = 1;
- }
- if (i & VOLUME_REPAIR_OBJECT_ID) {
- if (j)
- printf(" | ");
- printf("VOLUME_REPAIR_OBJECT_ID");
- j = 1;
- }
- if (i & VOLUME_DELETE_USN_UNDERWAY) {
- if (j)
- printf(" | ");
- printf("VOLUME_DELETE_USN_UNDERWAY");
- j = 1;
- }
- if (i & VOLUME_MOUNTED_ON_NT4) {
- if (j)
- printf(" | ");
- printf("VOLUME_MOUNTED_ON_NT4");
- j = 1;
- }
- if (i & VOLUME_UPGRADE_ON_MOUNT) {
- if (j)
- printf(" | ");
- printf("VOLUME_UPGRADE_ON_MOUNT");
- j = 1;
- }
- if (i & VOLUME_RESIZE_LOG_FILE) {
- if (j)
- printf(" | ");
- printf("VOLUME_RESIZE_LOG_FILE");
- j = 1;
- }
- if (i & VOLUME_IS_DIRTY) {
- if (j)
- printf(" | ");
- printf("VOLUME_IS_DIRTY");
- j = 1;
- }
- printf("\n");
- return;
- case AT_DATA:
- printf(skip, "DATA");
- return;
- case AT_INDEX_ROOT:
- /* TODO */
- printf("collation_rule %u\n", (unsigned)le32_to_cpu
- (((INDEX_ROOT*)val)->collation_rule));
- printf("index.entries_offset %u\n", (unsigned)le32_to_cpu
- (((INDEX_ROOT*)val)->index.entries_offset));
- printf("index.index_length %u\n", (unsigned)le32_to_cpu
- (((INDEX_ROOT*)val)->index.index_length));
- printf("%s\n", todo);
- return;
- case AT_INDEX_ALLOCATION:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_BITMAP:
- printf(skip, "BITMAP");
- return;
- case AT_REPARSE_POINT:
- /* TODO */
- printf("%s\n", todo);
- return;
- case AT_EA_INFORMATION:
- /* TODO */
- printf("%s\n", don_t_know);
- return;
- case AT_EA:
- /* TODO */
- printf("%s\n", don_t_know);
- return;
- case AT_LOGGED_UTILITY_STREAM:
- /* TODO */
- printf("%s\n", don_t_know);
- return;
- default:
- i = le32_to_cpu(type);
- printf("Cannot display unknown %s defined attribute type 0x%x"
- ".\n", (u32)i >=
- le32_to_cpu(AT_FIRST_USER_DEFINED_ATTRIBUTE) ?
- "user" : "system", i);
- }
-}
-
-/**
- * dump_resident_attr
- */
-static void dump_resident_attr(ATTR_RECORD *a)
-{
- int i;
-
- i = le32_to_cpu(a->value_length);
- printf("Attribute value length = %u (0x%x)\n", i, i);
- i = le16_to_cpu(a->value_offset);
- printf("Attribute value offset = %u (0x%x)\n", i, i);
- i = a->resident_flags;
- printf("Resident flags = 0x%x: ", i);
- if (!i)
- printf("NONE\n");
- else if (i & ~RESIDENT_ATTR_IS_INDEXED)
- printf("UNKNOWN FLAG(S)\n");
- else
- printf("RESIDENT_ATTR_IS_INDEXED\n");
- dump_resident_attr_val(a->type, (char*)a + le16_to_cpu(a->value_offset),
- le32_to_cpu(a->value_length));
-}
-
-/**
- * dump_mapping_pairs_array
- */
-static void dump_mapping_pairs_array(char *b __attribute__((unused)),
- unsigned int max_len __attribute__((unused)))
-{
- /* TODO */
- return;
-}
-
-/**
- * dump_non_resident_attr
- */
-static void dump_non_resident_attr(ATTR_RECORD *a)
-{
- s64 l;
- int i;
-
- l = sle64_to_cpu(a->lowest_vcn);
- printf("Lowest VCN = %lli (0x%llx)\n", (long long)l,
- (unsigned long long)l);
- l = sle64_to_cpu(a->highest_vcn);
- printf("Highest VCN = %lli (0x%llx)\n", (long long)l,
- (unsigned long long)l);
- printf("Mapping pairs array offset = 0x%x\n",
- le16_to_cpu(a->mapping_pairs_offset));
- printf("Compression unit = 0x%x: %sCOMPRESSED\n", a->compression_unit,
- a->compression_unit ? "" : "NOT ");
- if (sle64_to_cpu(a->lowest_vcn))
- printf("Attribute is not the first extent. The following "
- "sizes are meaningless:\n");
- l = sle64_to_cpu(a->allocated_size);
- printf("Allocated size = %lli (0x%llx)\n", (long long)l,
- (unsigned long long)l);
- l = sle64_to_cpu(a->data_size);
- printf("Data size = %lli (0x%llx)\n", (long long)l,
- (unsigned long long)l);
- l = sle64_to_cpu(a->initialized_size);
- printf("Initialized size = %lli (0x%llx)\n",
- (long long)l, (unsigned long long)l);
- if (a->flags & ATTR_COMPRESSION_MASK) {
- l = sle64_to_cpu(a->compressed_size);
- printf("Compressed size = %lli (0x%llx)\n",
- (long long)l, (unsigned long long)l);
- }
- i = le16_to_cpu(a->mapping_pairs_offset);
- dump_mapping_pairs_array((char*)a + i, le32_to_cpu(a->length) - i);
-}
-
-/**
- * dump_attr_record
- */
-static void dump_attr_record(ATTR_RECORD *a)
-{
- unsigned int u;
- char s[0x200];
- int i;
-
- printf("-- Beginning dump of attribute record. --\n");
- if (a->type == AT_END) {
- printf("Attribute type = 0x%x ($END)\n",
- (unsigned int)const_le32_to_cpu(AT_END));
- u = le32_to_cpu(a->length);
- printf("Length of resident part = %u (0x%x)\n", u, u);
- return;
- }
- u = le32_to_cpu(a->type);
- for (i = 0; g_vol->attrdef[i].type; i++)
- if (le32_to_cpu(g_vol->attrdef[i].type) >= u)
- break;
- if (g_vol->attrdef[i].type) {
-#if 0
- printf("type = 0x%x\n", le32_to_cpu(g_vol->attrdef[i].type));
- { char *p = (char*)g_vol->attrdef[i].name;
- printf("name = %c%c%c%c%c\n", *p, p[1], p[2], p[3], p[4]);
- }
-#endif
- if (ntfs_ucstombs(g_vol->attrdef[i].name, 0x40, (char**)&s, sizeof(s)) < 0) {
- ntfs_log_error("Could not convert Unicode string to single "
- "byte string in current locale.\n");
- strncpy(s, "Error converting Unicode string",
- sizeof(s));
- }
- } else {
- strncpy(s, "UNKNOWN_TYPE", sizeof(s));
- }
- printf("Attribute type = 0x%x (%s)\n", u, s);
- u = le32_to_cpu(a->length);
- printf("Length of resident part = %u (0x%x)\n", u, u);
- printf("Attribute is %sresident\n", a->non_resident ? "non-" : "");
- printf("Name length = %u unicode characters\n", a->name_length);
- printf("Name offset = %u (0x%x)\n", cpu_to_le16(a->name_offset),
- cpu_to_le16(a->name_offset));
- u = a->flags;
- if (a->name_length) {
- if (ntfs_ucstombs((ntfschar*)((char*)a + cpu_to_le16(a->name_offset)),
- min(sizeof(s), a->name_length + 1U), (char**)&s, sizeof(s)) < 0) {
- ntfs_log_error("Could not convert Unicode string to single "
- "byte string in current locale.\n");
- strncpy(s, "Error converting Unicode string",
- sizeof(s));
- }
- printf("Name = %s\n", s);
- }
- printf("Attribute flags = 0x%x: ", le16_to_cpu(u));
- if (!u) {
- printf("NONE");
- } else {
- int first = TRUE;
- if (u & ATTR_COMPRESSION_MASK) {
- if (u & ATTR_IS_COMPRESSED) {
- printf("ATTR_IS_COMPRESSED");
- first = FALSE;
- }
- if ((u & ATTR_COMPRESSION_MASK) & ~ATTR_IS_COMPRESSED) {
- if (!first)
- printf(" | ");
- else
- first = FALSE;
- printf("ATTR_UNKNOWN_COMPRESSION");
- }
- }
- if (u & ATTR_IS_ENCRYPTED) {
- if (!first)
- printf(" | ");
- else
- first = FALSE;
- printf("ATTR_IS_ENCRYPTED");
- }
- if (u & ATTR_IS_SPARSE) {
- if (!first)
- printf(" | ");
- else
- first = FALSE;
- printf("ATTR_IS_SPARSE");
- }
- }
- printf("\n");
- printf("Attribute instance = %u\n", le16_to_cpu(a->instance));
- if (a->non_resident) {
- dump_non_resident_attr(a);
- } else {
- dump_resident_attr(a);
- }
-}
-
-/**
- * dump_mft_record
- */
-__attribute__((unused))
-static void dump_mft_record(MFT_RECORD *m)
-{
- ATTR_RECORD *a;
- unsigned int u;
- MFT_REF r;
-
- printf("-- Beginning dump of mft record. --\n");
- u = le32_to_cpu(m->magic);
- printf("Mft record signature (magic) = %c%c%c%c\n", u & 0xff,
- u >> 8 & 0xff, u >> 16 & 0xff, u >> 24 & 0xff);
- u = le16_to_cpu(m->usa_ofs);
- printf("Update sequence array offset = %u (0x%x)\n", u, u);
- printf("Update sequence array size = %u\n", le16_to_cpu(m->usa_count));
- printf("$LogFile sequence number (lsn) = %llu\n",
- (unsigned long long)le64_to_cpu(m->lsn));
- printf("Sequence number = %u\n", le16_to_cpu(m->sequence_number));
- printf("Reference (hard link) count = %u\n",
- le16_to_cpu(m->link_count));
- u = le16_to_cpu(m->attrs_offset);
- printf("First attribute offset = %u (0x%x)\n", u, u);
- printf("Flags = %u: ", le16_to_cpu(m->flags));
- if (m->flags & MFT_RECORD_IN_USE)
- printf("MFT_RECORD_IN_USE");
- else
- printf("MFT_RECORD_NOT_IN_USE");
- if (m->flags & MFT_RECORD_IS_DIRECTORY)
- printf(" | MFT_RECORD_IS_DIRECTORY");
- printf("\n");
- u = le32_to_cpu(m->bytes_in_use);
- printf("Bytes in use = %u (0x%x)\n", u, u);
- u = le32_to_cpu(m->bytes_allocated);
- printf("Bytes allocated = %u (0x%x)\n", u, u);
- r = le64_to_cpu(m->base_mft_record);
- printf("Base mft record reference:\n\tMft record number = %llu\n\t"
- "Sequence number = %u\n", (unsigned long long)MREF(r),
- MSEQNO(r));
- printf("Next attribute instance = %u\n",
- le16_to_cpu(m->next_attr_instance));
- a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
- printf("-- Beginning dump of attributes within mft record. --\n");
- while ((char*)a < (char*)m + le32_to_cpu(m->bytes_in_use)) {
- dump_attr_record(a);
- if (a->type == AT_END)
- break;
- a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
- };
- printf("-- End of attributes. --\n");
-}
-
-
/**
* make_room_for_attribute - make room for an attribute inside an mft record
* @m: mft record
@@ -1980,21 +1587,17 @@ static int add_attr_std_info(MFT_RECORD
si.last_mft_change_time = si.creation_time;
si.last_access_time = si.creation_time;
si.file_attributes = flags; /* already LE */
- if (g_vol->major_ver < 3) {
- memset(&si.reserved12, 0, sizeof(si.reserved12));
- } else {
- si.maximum_versions = cpu_to_le32(0);
- si.version_number = cpu_to_le32(0);
- si.class_id = cpu_to_le32(0);
- si.security_id = security_id;
- if (si.security_id != 0)
- sd_size = 72;
- /* FIXME: $Quota support... */
- si.owner_id = cpu_to_le32(0);
- si.quota_charged = cpu_to_le64(0ULL);
- /* FIXME: $UsnJrnl support... Not needed on fresh w2k3-volume */
- si.usn = cpu_to_le64(0ULL);
- }
+ si.maximum_versions = cpu_to_le32(0);
+ si.version_number = cpu_to_le32(0);
+ si.class_id = cpu_to_le32(0);
+ si.security_id = security_id;
+ if (si.security_id != 0)
+ sd_size = 72;
+ /* FIXME: $Quota support... */
+ si.owner_id = cpu_to_le32(0);
+ si.quota_charged = cpu_to_le64(0ULL);
+ /* FIXME: $UsnJrnl support... Not needed on fresh w2k3-volume */
+ si.usn = cpu_to_le64(0ULL);
/* NTFS 1.2: size of si = 48, NTFS 3.[01]: size of si = 72 */
err = insert_resident_attr_in_mft_record(m, AT_STANDARD_INFORMATION,
NULL, 0, 0, 0, 0, (u8*)&si, sd_size);
@@ -2914,8 +2517,6 @@ static int initialize_quota(MFT_RECORD *
+ le16_to_cpu(idx_entry_q1->data_offset));
idx_entry_q1_data->version = const_cpu_to_le32(0x02);
idx_entry_q1_data->flags = QUOTA_FLAG_DEFAULT_LIMITS;
- if (g_vol->minor_ver == 0)
- idx_entry_q1_data->flags |= QUOTA_FLAG_OUT_OF_DATE;
idx_entry_q1_data->bytes_used = const_cpu_to_le64(0x00);
idx_entry_q1_data->change_time = utc2ntfs(mkntfs_time());
idx_entry_q1_data->threshold = const_cpu_to_le64((s64)-1);
@@ -3846,13 +3447,10 @@ static BOOL mkntfs_initialize_bitmaps(vo
for (i = g_vol->nr_clusters; i < (u64)g_lcn_bitmap_byte_size << 3; i++)
ntfs_bit_set(g_lcn_bitmap, i, 1);
/*
- * Determine mft_size: (16 (1.2) or 27 (3.0+) mft records) or
- * one cluster, whichever is bigger.
+ * Mft size is 27 (NTFS 3.0+) mft records or one cluster, whichever is
+ * bigger.
*/
- if (g_vol->major_ver >= 3)
- g_mft_size = 27;
- else
- g_mft_size = 16;
+ g_mft_size = 27;
g_mft_size *= g_vol->mft_record_size;
if (g_mft_size < (s32)g_vol->cluster_size)
g_mft_size = g_vol->cluster_size;
@@ -4010,13 +3608,7 @@ static BOOL mkntfs_initialize_rl_logfile
g_logfile_size = 512LL * 1024; /* -> 512kiB */
else if (volume_size <= 200LL * 1024 * 1024) /* < 200MiB */
g_logfile_size = 2048LL * 1024; /* -> 2MiB */
- else if (g_vol->major_ver < 3) {
- if (volume_size >= 400LL << 20) /* > 400MiB */
- g_logfile_size = 4 << 20; /* -> 4MiB */
- else
- g_logfile_size = (volume_size / 100) &
- ~(g_vol->cluster_size - 1);
- } else {
+ else {
/*
* FIXME: The $LogFile size is 64 MiB upwards from 12GiB but
* the "200" divider below apparently approximates "100" or
@@ -4132,14 +3724,13 @@ static BOOL mkntfs_fill_device_with_zero
*/
int i;
ssize_t bw;
- unsigned long long position, mid_clust;
+ unsigned long long position;
float progress_inc = (float)g_vol->nr_clusters / 100;
u64 volume_size;
volume_size = g_vol->nr_clusters << g_vol->cluster_size_bits;
ntfs_log_progress("Initializing device with zeroes: 0%%");
- mid_clust = (volume_size >> 1) / g_vol->cluster_size;
for (position = 0; position < (unsigned long long)g_vol->nr_clusters;
position++) {
if (!(position % (int)(progress_inc+1))) {
@@ -4158,15 +3749,6 @@ static BOOL mkntfs_fill_device_with_zero
"system.\n");
return FALSE;
}
- if (position == mid_clust &&
- (g_vol->major_ver < 1 ||
- (g_vol->major_ver == 1 &&
- g_vol->minor_ver < 2))) {
- ntfs_log_error("Error: Bad cluster found in "
- "location reserved for system "
- "file $Boot.\n");
- return FALSE;
- }
/* Add the baddie to our bad blocks list. */
if (!append_to_bad_blocks(position))
return FALSE;
@@ -4189,10 +3771,7 @@ static BOOL mkntfs_fill_device_with_zero
if (bw != -1 || errno != EIO) {
ntfs_log_error("This should not happen.\n");
return FALSE;
- } else if (i + 1ull == position &&
- (g_vol->major_ver >= 2 ||
- (g_vol->major_ver == 1 &&
- g_vol->minor_ver >= 2))) {
+ } else if (i + 1ull == position) {
ntfs_log_error("Error: Bad cluster found in "
"location reserved for system "
"file $Boot.\n");
@@ -4274,8 +3853,7 @@ static BOOL mkntfs_sync_index_record(IND
* create_file_volume -
*/
static BOOL create_file_volume(MFT_RECORD *m, MFT_REF root_ref,
- VOLUME_FLAGS fl
- , const GUID *volume_guid
+ VOLUME_FLAGS fl, const GUID *volume_guid
#ifndef ENABLE_UUID
__attribute__((unused))
#endif
@@ -4308,7 +3886,7 @@ static BOOL create_file_volume(MFT_RECOR
g_vol->minor_ver);
}
#ifdef ENABLE_UUID
- if (!err && g_vol->major_ver >= 3)
+ if (!err)
err = add_attr_object_id(m, volume_guid);
#endif
if (err < 0) {
@@ -4387,13 +3965,11 @@ static BOOL mkntfs_create_root_structure
VOLUME_FLAGS volume_flags = 0;
int nr_sysfiles;
u8 *buf_log = NULL;
- int buf_sds_first_size = 0;
- int buf_sds_size = 0;
- char *buf_sds_init = NULL;
- char *buf_sds = NULL;
+ int buf_sds_first_size;
+ char *buf_sds;
ntfs_log_quiet("Creating NTFS volume structures.\n");
- nr_sysfiles = g_vol->major_ver < 3 ? 16 : 27;
+ nr_sysfiles = 27;
/*
* Setup an empty mft record. Note, we can just give 0 as the mft
* reference as we are creating an NTFS 1.2 volume for which the mft
@@ -4439,8 +4015,7 @@ static BOOL mkntfs_create_root_structure
m = (MFT_RECORD*)(g_buf + i * g_vol->mft_record_size);
if (i < 16 || i > 23) {
- if (g_vol->major_ver >= 3 && g_vol->minor_ver >= 1)
- m->mft_record_number = cpu_to_le32(i);
+ m->mft_record_number = cpu_to_le32(i);
m->flags |= MFT_RECORD_IN_USE;
ntfs_bit_set(g_mft_bitmap, 0LL + i, 1);
}
@@ -4452,33 +4027,27 @@ static BOOL mkntfs_create_root_structure
if (opts.enable_compression)
file_attrs |= FILE_ATTR_COMPRESSED;
}
-
- if (g_vol->major_ver < 3) {
+ /* setting specific security_id flag and */
+ /* file permissions for ntfs 3.x */
+ if (i == 0 || i == 1 || i == 2 || i == 6 || i == 8 ||
+ i == 10) {
+ add_attr_std_info(m, file_attrs,
+ cpu_to_le32(0x0100));
+ } else if (i == 9) {
+ file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT;
+ add_attr_std_info(m, file_attrs,
+ cpu_to_le32(0x0101));
+ } else if (i == 11) {
add_attr_std_info(m, file_attrs,
- cpu_to_le32(0));
+ cpu_to_le32(0x0101));
+ } else if (i == 24 || i == 25 || i == 26) {
+ file_attrs |= FILE_ATTR_ARCHIVE;
+ file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT;
+ add_attr_std_info(m, file_attrs,
+ cpu_to_le32(0x0101));
} else {
- /* setting specific security_id flag and */
- /* file permissions for ntfs 3.x */
- if (i == 0 || i == 1 || i == 2 || i == 6 || i == 8 ||
- i == 10) {
- add_attr_std_info(m, file_attrs,
- cpu_to_le32(0x0100));
- } else if (i == 9) {
- file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT;
- add_attr_std_info(m, file_attrs,
- cpu_to_le32(0x0101));
- } else if (i == 11) {
- add_attr_std_info(m, file_attrs,
- cpu_to_le32(0x0101));
- } else if (i == 24 || i == 25 || i == 26) {
- file_attrs |= FILE_ATTR_ARCHIVE;
- file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT;
- add_attr_std_info(m, file_attrs,
- cpu_to_le32(0x0101));
- } else {
- add_attr_std_info(m, file_attrs,
- cpu_to_le32(0x00));
- }
+ add_attr_std_info(m, file_attrs,
+ cpu_to_le32(0x00));
}
}
/* The root directory mft reference. */
@@ -4493,19 +4062,8 @@ static BOOL mkntfs_create_root_structure
FILE_ATTR_I30_INDEX_PRESENT, 0, 0, ".",
FILE_NAME_WIN32_AND_DOS);
if (!err) {
- if (g_vol->major_ver == 1) {
- init_system_file_sd(FILE_root, &sd, &i);
- err = add_attr_sd(m, sd, i);
- } else if (NTFS_V3_0(g_vol->major_ver, g_vol->minor_ver)) {
- init_system_file_sd(FILE_root, &sd, &i);
- err = add_attr_sd(m, sd, i);
- } else if (NTFS_V3_1(g_vol->major_ver, g_vol->minor_ver)) {
- init_root_sd_31(&sd, &i);
- err = add_attr_sd(m, sd, i);
- } else {
- ntfs_log_error("BUG: Unsupported NTFS version\n");
- return FALSE;
- }
+ init_root_sd_31(&sd, &i);
+ err = add_attr_sd(m, sd, i);
}
/* FIXME: This should be IGNORE_CASE */
if (!err)
@@ -4541,7 +4099,6 @@ static BOOL mkntfs_create_root_structure
strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
/* Add all other attributes, on a per-file basis for clarity. */
ntfs_log_verbose("Creating $MFT (mft record 0)\n");
m = (MFT_RECORD*)g_buf;
@@ -4553,10 +4110,6 @@ static BOOL mkntfs_create_root_structure
g_mft_size, FILE_ATTR_HIDDEN |
FILE_ATTR_SYSTEM, 0, 0, "$MFT",
FILE_NAME_WIN32_AND_DOS);
- if (!err && g_vol->major_ver == 1) {
- init_system_file_sd(FILE_MFT, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
/* mft_bitmap is not modified in mkntfs; no need to sync it later. */
if (!err)
err = add_attr_bitmap_positioned(m, NULL, 0, 0, g_rl_mft_bmp,
@@ -4565,8 +4118,6 @@ static BOOL mkntfs_create_root_structure
ntfs_log_error("Couldn't create $MFT: %s\n", strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
-
ntfs_log_verbose("Creating $MFTMirr (mft record 1)\n");
m = (MFT_RECORD*)(g_buf + 1 * g_vol->mft_record_size);
err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_mftmirr, g_buf,
@@ -4578,21 +4129,15 @@ static BOOL mkntfs_create_root_structure
g_rl_mftmirr[0].length * g_vol->cluster_size,
FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0, 0,
"$MFTMirr", FILE_NAME_WIN32_AND_DOS);
- if (!err && g_vol->major_ver == 1) {
- init_system_file_sd(FILE_MFTMirr, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
if (err < 0) {
ntfs_log_error("Couldn't create $MFTMirr: %s\n", strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
ntfs_log_verbose("Creating $LogFile (mft record 2)\n");
m = (MFT_RECORD*)(g_buf + 2 * g_vol->mft_record_size);
buf_log = ntfs_malloc(g_logfile_size);
if (!buf_log)
return FALSE;
-
memset(buf_log, -1, g_logfile_size);
err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, buf_log,
g_logfile_size);
@@ -4604,19 +4149,12 @@ static BOOL mkntfs_create_root_structure
g_logfile_size, g_logfile_size,
FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0, 0,
"$LogFile", FILE_NAME_WIN32_AND_DOS);
- if (!err && g_vol->major_ver == 1) {
- init_system_file_sd(FILE_LogFile, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
if (err < 0) {
ntfs_log_error("Couldn't create $LogFile: %s\n", strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
-
ntfs_log_verbose("Creating $AttrDef (mft record 4)\n");
m = (MFT_RECORD*)(g_buf + 4 * g_vol->mft_record_size);
-
err = add_attr_data(m, NULL, 0, 0, 0, (u8*)g_vol->attrdef, g_vol->attrdef_len);
if (!err)
err = create_hardlink(g_index_block, root_ref, m,
@@ -4633,7 +4171,6 @@ static BOOL mkntfs_create_root_structure
ntfs_log_error("Couldn't create $AttrDef: %s\n", strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
ntfs_log_verbose("Creating $Bitmap (mft record 6)\n");
m = (MFT_RECORD*)(g_buf + 6 * g_vol->mft_record_size);
/* the data attribute of $Bitmap must be non-resident or otherwise */
@@ -4651,16 +4188,10 @@ static BOOL mkntfs_create_root_structure
~(g_vol->cluster_size - 1), g_lcn_bitmap_byte_size,
FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0, 0,
"$Bitmap", FILE_NAME_WIN32_AND_DOS);
- if (!err && g_vol->major_ver == 1) {
- init_system_file_sd(FILE_Bitmap, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
if (err < 0) {
ntfs_log_error("Couldn't create $Bitmap: %s\n", strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
-
ntfs_log_verbose("Creating $Boot (mft record 7)\n");
m = (MFT_RECORD*)(g_buf + 7 * g_vol->mft_record_size);
bs = ntfs_calloc(8192);
@@ -4763,8 +4294,16 @@ static BOOL mkntfs_create_root_structure
}
free(bs);
#ifdef ENABLE_UUID
- /* Generate a GUID for the volume. */
- uuid_generate((void*)&g_vol->guid);
+ /*
+ * We cheat a little here and if the user has requested all times to be
+ * set to zero then we set the GUID to zero as well. This options is
+ * only used for development purposes so that should be fine.
+ */
+ if (!opts.use_epoch_time) {
+ /* Generate a GUID for the volume. */
+ uuid_generate((void*)&g_vol->guid);
+ } else
+ memset(&g_vol->guid, 0, sizeof(g_vol->guid));
#endif
if (!create_file_volume(m, root_ref, volume_flags, &g_vol->guid))
return FALSE;
@@ -4783,94 +4322,52 @@ static BOOL mkntfs_create_root_structure
0LL, 0LL, FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM,
0, 0, "$BadClus", FILE_NAME_WIN32_AND_DOS);
}
- if (!err && g_vol->major_ver == 1) {
- init_system_file_sd(FILE_BadClus, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
if (err < 0) {
ntfs_log_error("Couldn't create $BadClus: %s\n", strerror(-err));
return FALSE;
}
+ /* create $Secure (NTFS 3.0+) */
+ ntfs_log_verbose("Creating $Secure (mft record 9)\n");
+ m = (MFT_RECORD*)(g_buf + 9 * g_vol->mft_record_size);
+ m->flags |= MFT_RECORD_IS_VIEW_INDEX;
+ if (!err)
+ err = create_hardlink(g_index_block, root_ref, m,
+ MK_LE_MREF(9, 9), 0LL, 0LL,
+ FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
+ FILE_ATTR_VIEW_INDEX_PRESENT, 0, 0,
+ "$Secure", FILE_NAME_WIN32_AND_DOS);
+ buf_sds = NULL;
+ buf_sds_first_size = 0;
+ if (!err) {
+ int buf_sds_size;
- /* dump_mft_record(m); */
- /* create $Quota (1.2) or $Secure (3.0+) */
- if (g_vol->major_ver < 3) {
- ntfs_log_verbose("Creating $Quota (mft record 9)\n");
- m = (MFT_RECORD*)(g_buf + 9 * g_vol->mft_record_size);
- err = add_attr_data(m, NULL, 0, 0, 0, NULL, 0);
- if (!err)
- err = create_hardlink(g_index_block, root_ref, m,
- MK_LE_MREF(9, 9), 0LL, 0LL,
- FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0,
- 0, "$Quota", FILE_NAME_WIN32_AND_DOS);
- if (!err) {
- init_system_file_sd(FILE_Secure, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
- if (err < 0) {
- ntfs_log_error("Couldn't create $Quota: %s\n",
- strerror(-err));
- return FALSE;
- }
- } else {
- ntfs_log_verbose("Creating $Secure (mft record 9)\n");
- m = (MFT_RECORD*)(g_buf + 9 * g_vol->mft_record_size);
- m->flags |= MFT_RECORD_IS_VIEW_INDEX;
- if (!err)
- err = create_hardlink(g_index_block, root_ref, m,
- MK_LE_MREF(9, 9), 0LL, 0LL,
- FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
- FILE_ATTR_VIEW_INDEX_PRESENT, 0, 0,
- "$Secure", FILE_NAME_WIN32_AND_DOS);
- if (!err) {
- if (g_vol->minor_ver == 0) {
- buf_sds_first_size = 0x1E0;
- buf_sds_size = 0x40000 + buf_sds_first_size;
- buf_sds_init = ntfs_calloc(buf_sds_first_size);
- if (!buf_sds_init)
- return FALSE;
- init_secure_30(buf_sds_init);
- } else {
- buf_sds_first_size = 0xFC;
- buf_sds_size = 0x40000 + buf_sds_first_size;
- buf_sds_init = ntfs_calloc(buf_sds_first_size);
- if (!buf_sds_init)
- return FALSE;
- init_secure_31(buf_sds_init);
- }
- buf_sds = ntfs_calloc(buf_sds_size);
- if (!buf_sds) {
- free(buf_sds_init);
- return FALSE;
- }
- memcpy(buf_sds, buf_sds_init, buf_sds_first_size);
- memcpy(buf_sds + 0x40000, buf_sds_init,
- buf_sds_first_size);
- err = add_attr_data(m, "$SDS", 4, 0, 0, (u8*)buf_sds,
- buf_sds_size);
- free(buf_sds);
- }
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$SDH", 4, 0, AT_UNUSED,
- COLLATION_NTOFS_SECURITY_HASH,
- g_vol->indx_record_size);
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$SII", 4, 0, AT_UNUSED,
- COLLATION_NTOFS_ULONG, g_vol->indx_record_size);
- if (!err)
- err = initialize_secure(buf_sds_init, buf_sds_first_size, m);
-
- free(buf_sds_init);
- buf_sds_init = NULL;
- if (err < 0) {
- ntfs_log_error("Couldn't create $Secure: %s\n",
- strerror(-err));
+ buf_sds_first_size = 0xfc;
+ buf_sds_size = 0x40000 + buf_sds_first_size;
+ buf_sds = ntfs_calloc(buf_sds_size);
+ if (!buf_sds)
return FALSE;
- }
+ init_secure_31(buf_sds);
+ memcpy(buf_sds + 0x40000, buf_sds, buf_sds_first_size);
+ err = add_attr_data(m, "$SDS", 4, 0, 0, (u8*)buf_sds,
+ buf_sds_size);
+ }
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$SDH", 4, 0, AT_UNUSED,
+ COLLATION_NTOFS_SECURITY_HASH,
+ g_vol->indx_record_size);
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$SII", 4, 0, AT_UNUSED,
+ COLLATION_NTOFS_ULONG, g_vol->indx_record_size);
+ if (!err)
+ err = initialize_secure(buf_sds, buf_sds_first_size, m);
+ free(buf_sds);
+ if (err < 0) {
+ ntfs_log_error("Couldn't create $Secure: %s\n",
+ strerror(-err));
+ return FALSE;
}
- /* dump_mft_record(m); */
ntfs_log_verbose("Creating $UpCase (mft record 0xa)\n");
m = (MFT_RECORD*)(g_buf + 0xa * g_vol->mft_record_size);
err = add_attr_data(m, NULL, 0, 0, 0, (u8*)g_vol->upcase,
@@ -4883,56 +4380,33 @@ static BOOL mkntfs_create_root_structure
~(g_vol->cluster_size - 1), g_vol->upcase_len << 1,
FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0, 0,
"$UpCase", FILE_NAME_WIN32_AND_DOS);
- if (!err && g_vol->major_ver == 1) {
- init_system_file_sd(FILE_UpCase, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
if (err < 0) {
ntfs_log_error("Couldn't create $UpCase: %s\n", strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
-
- if (g_vol->major_ver < 3) {
- ntfs_log_verbose("Creating empty record, marked as in use "
- "(mft record 11)\n");
- m = (MFT_RECORD*)(g_buf + 11 * g_vol->mft_record_size);
- err = add_attr_data(m, NULL, 0, 0, 0, NULL, 0);
- if (!err) {
- init_system_file_sd(11, &sd, &j);
- err = add_attr_sd(m, sd, j);
- }
- if (err < 0) {
- ntfs_log_error("Couldn't create system file 11 (0x0b): %s\n",
- strerror(-err));
- return FALSE;
- }
- /* dump_mft_record(m); */
- } else {
- ntfs_log_verbose("Creating $Extend (mft record 11)\n");
- /*
- * $Extends index must be resident. Otherwise, w2k3 will
- * regard the volume as corrupt. (ERSO)
- */
- m = (MFT_RECORD*)(g_buf + 11 * g_vol->mft_record_size);
- m->flags |= MFT_RECORD_IS_DIRECTORY;
- if (!err)
- err = create_hardlink(g_index_block, root_ref, m,
- MK_LE_MREF(11, 11), 0LL, 0LL,
- FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
- FILE_ATTR_I30_INDEX_PRESENT, 0, 0,
- "$Extend", FILE_NAME_WIN32_AND_DOS);
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$I30", 4, 0, AT_FILE_NAME,
- COLLATION_FILE_NAME, g_vol->indx_record_size);
- if (err < 0) {
- ntfs_log_error("Couldn't create $Extend: %s\n",
- strerror(-err));
- return FALSE;
- }
+ ntfs_log_verbose("Creating $Extend (mft record 11)\n");
+ /*
+ * $Extend index must be resident. Otherwise, w2k3 will regard the
+ * volume as corrupt. (ERSO)
+ */
+ m = (MFT_RECORD*)(g_buf + 11 * g_vol->mft_record_size);
+ m->flags |= MFT_RECORD_IS_DIRECTORY;
+ if (!err)
+ err = create_hardlink(g_index_block, root_ref, m,
+ MK_LE_MREF(11, 11), 0LL, 0LL,
+ FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
+ FILE_ATTR_I30_INDEX_PRESENT, 0, 0,
+ "$Extend", FILE_NAME_WIN32_AND_DOS);
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$I30", 4, 0, AT_FILE_NAME,
+ COLLATION_FILE_NAME, g_vol->indx_record_size);
+ if (err < 0) {
+ ntfs_log_error("Couldn't create $Extend: %s\n",
+ strerror(-err));
+ return FALSE;
}
- /* NTFS 1.2 reserved system files (mft records 0xc-0xf) */
+ /* NTFS reserved system files (mft records 0xc-0xf) */
for (i = 0xc; i < 0x10; i++) {
ntfs_log_verbose("Creating system file (mft record 0x%x)\n", i);
m = (MFT_RECORD*)(g_buf + i * g_vol->mft_record_size);
@@ -4946,81 +4420,78 @@ static BOOL mkntfs_create_root_structure
i, i, strerror(-err));
return FALSE;
}
- /* dump_mft_record(m); */
}
/* create systemfiles for ntfs volumes (3.1) */
/* starting with file 24 (ignoring file 16-23) */
- if (g_vol->major_ver >= 3) {
- extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
- FILE_ATTR_ARCHIVE | FILE_ATTR_VIEW_INDEX_PRESENT;
- ntfs_log_verbose("Creating $Quota (mft record 24)\n");
- m = (MFT_RECORD*)(g_buf + 24 * g_vol->mft_record_size);
- m->flags |= MFT_RECORD_IS_4;
- m->flags |= MFT_RECORD_IS_VIEW_INDEX;
- if (!err)
- err = create_hardlink_res((MFT_RECORD*)(g_buf +
- 11 * g_vol->mft_record_size), extend_ref, m,
- MK_LE_MREF(24, 1), 0LL, 0LL, extend_flags,
- 0, 0, "$Quota", FILE_NAME_WIN32_AND_DOS);
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$Q", 2, 0, AT_UNUSED,
- COLLATION_NTOFS_ULONG, g_vol->indx_record_size);
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
- COLLATION_NTOFS_SID, g_vol->indx_record_size);
- if (!err)
- err = initialize_quota(m);
- if (err < 0) {
- ntfs_log_error("Couldn't create $Quota: %s\n", strerror(-err));
- return FALSE;
- }
- ntfs_log_verbose("Creating $ObjId (mft record 25)\n");
- m = (MFT_RECORD*)(g_buf + 25 * g_vol->mft_record_size);
- m->flags |= MFT_RECORD_IS_4;
- m->flags |= MFT_RECORD_IS_VIEW_INDEX;
- if (!err)
- err = create_hardlink_res((MFT_RECORD*)(g_buf +
- 11 * g_vol->mft_record_size), extend_ref,
- m, MK_LE_MREF(25, 1), 0LL, 0LL,
- extend_flags, 0, 0, "$ObjId",
- FILE_NAME_WIN32_AND_DOS);
-
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
- COLLATION_NTOFS_ULONGS,
- g_vol->indx_record_size);
+ extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
+ FILE_ATTR_ARCHIVE | FILE_ATTR_VIEW_INDEX_PRESENT;
+ ntfs_log_verbose("Creating $Quota (mft record 24)\n");
+ m = (MFT_RECORD*)(g_buf + 24 * g_vol->mft_record_size);
+ m->flags |= MFT_RECORD_IS_4;
+ m->flags |= MFT_RECORD_IS_VIEW_INDEX;
+ if (!err)
+ err = create_hardlink_res((MFT_RECORD*)(g_buf +
+ 11 * g_vol->mft_record_size), extend_ref, m,
+ MK_LE_MREF(24, 1), 0LL, 0LL, extend_flags,
+ 0, 0, "$Quota", FILE_NAME_WIN32_AND_DOS);
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$Q", 2, 0, AT_UNUSED,
+ COLLATION_NTOFS_ULONG, g_vol->indx_record_size);
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
+ COLLATION_NTOFS_SID, g_vol->indx_record_size);
+ if (!err)
+ err = initialize_quota(m);
+ if (err < 0) {
+ ntfs_log_error("Couldn't create $Quota: %s\n", strerror(-err));
+ return FALSE;
+ }
+ ntfs_log_verbose("Creating $ObjId (mft record 25)\n");
+ m = (MFT_RECORD*)(g_buf + 25 * g_vol->mft_record_size);
+ m->flags |= MFT_RECORD_IS_4;
+ m->flags |= MFT_RECORD_IS_VIEW_INDEX;
+ if (!err)
+ err = create_hardlink_res((MFT_RECORD*)(g_buf +
+ 11 * g_vol->mft_record_size), extend_ref,
+ m, MK_LE_MREF(25, 1), 0LL, 0LL,
+ extend_flags, 0, 0, "$ObjId",
+ FILE_NAME_WIN32_AND_DOS);
+
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
+ COLLATION_NTOFS_ULONGS,
+ g_vol->indx_record_size);
#ifdef ENABLE_UUID
- if (!err)
- err = index_obj_id_insert(m, &g_vol->guid,
- MK_LE_MREF(FILE_Volume, FILE_Volume));
+ if (!err)
+ err = index_obj_id_insert(m, &g_vol->guid,
+ MK_LE_MREF(FILE_Volume, FILE_Volume));
#endif
- if (err < 0) {
- ntfs_log_error("Couldn't create $ObjId: %s\n",
- strerror(-err));
- return FALSE;
- }
- ntfs_log_verbose("Creating $Reparse (mft record 26)\n");
- m = (MFT_RECORD*)(g_buf + 26 * g_vol->mft_record_size);
- m->flags |= MFT_RECORD_IS_4;
- m->flags |= MFT_RECORD_IS_VIEW_INDEX;
- if (!err)
- err = create_hardlink_res((MFT_RECORD*)(g_buf +
- 11 * g_vol->mft_record_size),
- extend_ref, m, MK_LE_MREF(26, 1),
- 0LL, 0LL, extend_flags, 0, 0,
- "$Reparse", FILE_NAME_WIN32_AND_DOS);
- /* FIXME: This should be IGNORE_CASE */
- if (!err)
- err = add_attr_index_root(m, "$R", 2, 0, AT_UNUSED,
- COLLATION_NTOFS_ULONGS, g_vol->indx_record_size);
- if (err < 0) {
- ntfs_log_error("Couldn't create $Reparse: %s\n",
+ if (err < 0) {
+ ntfs_log_error("Couldn't create $ObjId: %s\n",
strerror(-err));
- return FALSE;
- }
+ return FALSE;
+ }
+ ntfs_log_verbose("Creating $Reparse (mft record 26)\n");
+ m = (MFT_RECORD*)(g_buf + 26 * g_vol->mft_record_size);
+ m->flags |= MFT_RECORD_IS_4;
+ m->flags |= MFT_RECORD_IS_VIEW_INDEX;
+ if (!err)
+ err = create_hardlink_res((MFT_RECORD*)(g_buf +
+ 11 * g_vol->mft_record_size),
+ extend_ref, m, MK_LE_MREF(26, 1),
+ 0LL, 0LL, extend_flags, 0, 0,
+ "$Reparse", FILE_NAME_WIN32_AND_DOS);
+ /* FIXME: This should be IGNORE_CASE */
+ if (!err)
+ err = add_attr_index_root(m, "$R", 2, 0, AT_UNUSED,
+ COLLATION_NTOFS_ULONGS, g_vol->indx_record_size);
+ if (err < 0) {
+ ntfs_log_error("Couldn't create $Reparse: %s\n",
+ strerror(-err));
+ return FALSE;
}
return TRUE;
}
@@ -5049,6 +4520,9 @@ static int mkntfs_redirect(struct mkntfs
ntfs_log_perror("Could not create volume");
goto done;
}
+ /* Create NTFS 3.1 (Windows XP/Vista) volumes. */
+ g_vol->major_ver = 3;
+ g_vol->minor_ver = 1;
/* Transfer some options to the volume. */
if (opts.label) {
g_vol->vol_name = strdup(opts.label);
@@ -5057,14 +4531,6 @@ static int mkntfs_redirect(struct mkntfs
goto done;
}
}
- if (opts.ver_major) {
- g_vol->major_ver = opts.ver_major;
- g_vol->minor_ver = opts.ver_minor;
- } else {
- /* Create NTFS 3.1 (Windows XP) volumes by default. */
- g_vol->major_ver = 3;
- g_vol->minor_ver = 1;
- }
if (opts.cluster_size >= 0)
g_vol->cluster_size = opts.cluster_size;
/* Length is in unicode characters. */
@@ -5074,25 +4540,14 @@ static int mkntfs_redirect(struct mkntfs
goto done;
init_upcase_table(g_vol->upcase, g_vol->upcase_len * sizeof(ntfschar));
- if (g_vol->major_ver < 3) {
- g_vol->attrdef = ntfs_calloc(36000);
- if (g_vol->attrdef) {
- memcpy(g_vol->attrdef, attrdef_ntfs12_array,
- sizeof(attrdef_ntfs12_array));
- g_vol->attrdef_len = 36000;
- }
- } else {
- g_vol->attrdef = ntfs_malloc(sizeof(attrdef_ntfs3x_array));
- if (g_vol->attrdef) {
- memcpy(g_vol->attrdef, attrdef_ntfs3x_array,
- sizeof(attrdef_ntfs3x_array));
- g_vol->attrdef_len = sizeof(attrdef_ntfs3x_array);
- }
- }
+ g_vol->attrdef = ntfs_malloc(sizeof(attrdef_ntfs3x_array));
if (!g_vol->attrdef) {
ntfs_log_perror("Could not create attrdef structure");
goto done;
}
+ memcpy(g_vol->attrdef, attrdef_ntfs3x_array,
+ sizeof(attrdef_ntfs3x_array));
+ g_vol->attrdef_len = sizeof(attrdef_ntfs3x_array);
/* Open the partition. */
if (!mkntfs_open_partition(g_vol))
goto done;
@@ -5259,4 +4714,3 @@ int main(int argc, char *argv[])
done:
return result;
}
-
Index: sd.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sd.c 25 Sep 2006 16:58:38 -0000 1.14
+++ sd.c 13 Dec 2006 10:46:50 -0000 1.15
@@ -5,7 +5,7 @@
/**
* init_system_file_sd
*
- * NTFS 1.2, 3.0, 3.1 - System files security decriptors
+ * NTFS 3.1 - System files security decriptors
* =====================================================
*
* Create the security descriptor for system file number @sys_file_no and
@@ -17,9 +17,7 @@
* $Volume, $Quota, and system files 0xb-0xf are the same. They are almost the
* same as the above, the only difference being that the two SIDs present in
* the DACL grant GENERIC_WRITE and GENERIC_READ equivalent privileges while
- * the above only grant GENERIC_READ equivalent privileges. (For some reason
- * the flags for GENERIC_READ/GENERIC_WRITE are not set by NT4, even though
- * the permissions are equivalent, so we comply.
+ * the above only grant GENERIC_READ equivalent privileges.
*
* Root directory system file (".") is different altogether.
*
@@ -46,15 +44,9 @@ void init_system_file_sd(int sys_file_no
sd->revision = 1;
sd->alignment = 0;
sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
- if (sys_file_no == FILE_root) {
- *sd_val_len = 0x50;
- sd->owner = const_cpu_to_le32(0x30);
- sd->group = const_cpu_to_le32(0x40);
- } else {
- *sd_val_len = 0x68;
- sd->owner = const_cpu_to_le32(0x48);
- sd->group = const_cpu_to_le32(0x58);
- }
+ *sd_val_len = 0x68;
+ sd->owner = const_cpu_to_le32(0x48);
+ sd->group = const_cpu_to_le32(0x58);
sd->sacl = const_cpu_to_le32(0);
sd->dacl = const_cpu_to_le32(0x14);
/*
@@ -64,13 +56,8 @@ void init_system_file_sd(int sys_file_no
acl = (ACL*)((char*)sd + le32_to_cpu(sd->dacl));
acl->revision = 2;
acl->alignment1 = 0;
- if (sys_file_no == FILE_root) {
- acl->size = const_cpu_to_le16(0x1c);
- acl->ace_count = const_cpu_to_le16(1);
- } else {
- acl->size = const_cpu_to_le16(0x34);
- acl->ace_count = const_cpu_to_le16(2);
- }
+ acl->size = const_cpu_to_le16(0x34);
+ acl->ace_count = const_cpu_to_le16(2);
acl->alignment2 = const_cpu_to_le16(0);
/*
* Now at offset 0x1c, just after the DACL's ACL, we have the first
@@ -78,10 +65,7 @@ void init_system_file_sd(int sys_file_no
*/
aa_ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
aa_ace->type = ACCESS_ALLOWED_ACE_TYPE;
- if (sys_file_no == FILE_root)
- aa_ace->flags = CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE;
- else
- aa_ace->flags = 0;
+ aa_ace->flags = 0;
aa_ace->size = const_cpu_to_le16(0x14);
switch (sys_file_no) {
case FILE_MFT: case FILE_MFTMirr: case FILE_LogFile:
@@ -96,13 +80,6 @@ void init_system_file_sd(int sys_file_no
FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA |
FILE_WRITE_DATA | FILE_READ_DATA;
break;
- case FILE_root:
- aa_ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
- FILE_READ_ATTRIBUTES | FILE_DELETE_CHILD |
- FILE_TRAVERSE | FILE_WRITE_EA | FILE_READ_EA |
- FILE_ADD_SUBDIRECTORY | FILE_ADD_FILE |
- FILE_LIST_DIRECTORY;
- break;
}
aa_ace->sid.revision = 1;
aa_ace->sid.sub_authority_count = 1;
@@ -111,63 +88,53 @@ void init_system_file_sd(int sys_file_no
aa_ace->sid.identifier_authority.value[2] = 0;
aa_ace->sid.identifier_authority.value[3] = 0;
aa_ace->sid.identifier_authority.value[4] = 0;
- if (sys_file_no == FILE_root) {
- /* SECURITY_WORLD_SID_AUTHORITY (S-1-1) */
- aa_ace->sid.identifier_authority.value[5] = 1;
- aa_ace->sid.sub_authority[0] =
- const_cpu_to_le32(SECURITY_WORLD_RID);
- /* This is S-1-1-0, the WORLD_SID. */
- } else {
- /* SECURITY_NT_SID_AUTHORITY (S-1-5) */
- aa_ace->sid.identifier_authority.value[5] = 5;
- aa_ace->sid.sub_authority[0] =
- const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
- }
+ /* SECURITY_NT_SID_AUTHORITY (S-1-5) */
+ aa_ace->sid.identifier_authority.value[5] = 5;
+ aa_ace->sid.sub_authority[0] =
+ const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
/*
* Now at offset 0x30 within security descriptor, just after the first
* ACE of the DACL. A...
[truncated message content] |
|
From: Anton A. <ai...@de...> - 2006-12-13 10:46:58
|
Changes by: aia21 Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv1960 Modified Files: ChangeLog NEWS configure.ac Log Message: Update version to 2.0.0, update NEWS, update mkntfs man page and mkntfs itself. - mkntfs: As announced, remove the deprecated support for creation of NTFS 1.2/3.0 volumes. We now create NTFS 3.1 volumes only. (Anton) - mkntfs: Remove lots of unused/unneeded debugging code. (Anton) Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.431 retrieving revision 1.432 diff -u -p -r1.431 -r1.432 --- ChangeLog 13 Dec 2006 00:11:50 -0000 1.431 +++ ChangeLog 13 Dec 2006 10:46:49 -0000 1.432 @@ -1,4 +1,4 @@ -xx/xx/2006 - x.xx.x - . +xx/12/2006 - 2.0.0 - ntfsmount sports full r/w and ntfsresize supports Vista. - ntfsmount now creates files and directories with security descriptor that grant full access to everyone. (Yura) @@ -112,6 +112,9 @@ xx/xx/2006 - x.xx.x - . - mkntfs: Always set default cluster size to 4096 bytes regardless of volume size. This is what Windows Vista does and it makes perfect sense from a performance point of view. (Anton) + - mkntfs: As announced, remove the deprecated support for creation of + NTFS 1.2/3.0 volumes. We now create NTFS 3.1 volumes only. (Anton) + - mkntfs: Remove lots of unused/unneeded debugging code. (Anton) 21/06/2006 - 1.13.1 - Various fixes. Index: NEWS =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/NEWS,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- NEWS 24 Jul 2006 08:48:40 -0000 1.33 +++ NEWS 13 Dec 2006 10:46:49 -0000 1.34 @@ -1,13 +1,10 @@ Current news ============ -Older news -========== +ntfsmount now has full basic read/write support. -mkntfs now creates NTFS 3.1 (Windows XP) volumes by default. The old NTFS 1.2 -format is now deprecated and whilst it can still be specified using a command -line option, it will be removed in a future release. +ntfsresize (and the entirety of ntfsprogs/libntfs in fact) now have full +support for Windows Vista. -ntfsmount can create/delete/move files and directories! It is not a full -implementation, thus sometimes it will say 'Operation is not supported', -nothing bad will happen to user data in this case. (Yura Pakhuchiy) +mkntfs now creates a DCE compliant GUID for the volume and does a few other +things to be more compliant with Windows Vista. Index: configure.ac =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v retrieving revision 1.116 retrieving revision 1.117 diff -u -p -r1.116 -r1.117 --- configure.ac 13 Dec 2006 00:11:50 -0000 1.116 +++ configure.ac 13 Dec 2006 10:46:49 -0000 1.117 @@ -22,7 +22,7 @@ # AC_PREREQ(2.59) -AC_INIT([ntfsprogs],[1.13.2-WIP],[lin...@li...]) +AC_INIT([ntfsprogs],[2.0.0],[lin...@li...]) # # Before making a release, the LTVERSION string should be modified. |
|
From: Anton A. <ai...@de...> - 2006-12-13 09:17:23
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv25386/ntfsprogs
Modified Files:
mkntfs.c
Log Message:
- Do not create object id attribute on NTFS 1.2 volumes.
- Create object id attribute after volume flags attribute.
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- mkntfs.c 13 Dec 2006 00:11:50 -0000 1.152
+++ mkntfs.c 13 Dec 2006 09:17:14 -0000 1.153
@@ -4299,10 +4299,6 @@ static BOOL create_file_volume(MFT_RECOR
if (!err)
err = add_attr_vol_name(m, g_vol->vol_name, g_vol->vol_name ?
strlen(g_vol->vol_name) : 0);
-#ifdef ENABLE_UUID
- if (!err)
- err = add_attr_object_id(m, volume_guid);
-#endif
if (!err) {
if (fl & VOLUME_IS_DIRTY)
ntfs_log_quiet("Setting the volume dirty so check "
@@ -4311,6 +4307,10 @@ static BOOL create_file_volume(MFT_RECOR
err = add_attr_vol_info(m, fl, g_vol->major_ver,
g_vol->minor_ver);
}
+#ifdef ENABLE_UUID
+ if (!err && g_vol->major_ver >= 3)
+ err = add_attr_object_id(m, volume_guid);
+#endif
if (err < 0) {
ntfs_log_error("Couldn't create $Volume: %s\n",
strerror(-err));
|
|
From: Anton A. <ai...@de...> - 2006-12-13 00:11:59
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv32753/include/ntfs
Modified Files:
volume.h
Log Message:
- mkntfs: Generate a random DCE compliant UUID for the created volume
and include --with-uuid[=PFX] and --without-uuid options. (Anton)
- configure.ac: Set language to C. (Anton)
- mkntfs: Always set default cluster size to 4096 bytes regardless of
volume size. This is what Windows Vista does and it makes perfect
sense from a performance point of view. (Anton)
Index: volume.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- volume.h 11 Dec 2006 03:03:30 -0000 1.28
+++ volume.h 13 Dec 2006 00:11:50 -0000 1.29
@@ -152,6 +152,8 @@ struct _ntfs_volume {
u8 major_ver; /* Ntfs major version of volume. */
u8 minor_ver; /* Ntfs minor version of volume. */
u16 flags; /* Bit array of VOLUME_* flags. */
+ GUID guid; /* The volume guid if present (otherwise it is
+ a NULL guid). */
u16 sector_size; /* Byte size of a sector. */
u8 sector_size_bits; /* Log(2) of the byte size of a sector. */
|
|
From: Anton A. <ai...@de...> - 2006-12-13 00:11:58
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv32753/ntfsprogs
Modified Files:
.cvsignore Makefile.am mkntfs.8.in mkntfs.c ntfsclone.c
Log Message:
- mkntfs: Generate a random DCE compliant UUID for the created volume
and include --with-uuid[=PFX] and --without-uuid options. (Anton)
- configure.ac: Set language to C. (Anton)
- mkntfs: Always set default cluster size to 4096 bytes regardless of
volume size. This is what Windows Vista does and it makes perfect
sense from a performance point of view. (Anton)
Index: .cvsignore
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 7 Oct 2005 12:52:52 -0000 1.6
+++ .cvsignore 13 Dec 2006 00:11:50 -0000 1.7
@@ -4,6 +4,7 @@ Makefile
Makefile.in
mkntfs
ntfscat
+ntfsck
ntfsclone
ntfscluster
ntfscmp
Index: Makefile.am
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- Makefile.am 11 Dec 2006 03:06:35 -0000 1.62
+++ Makefile.am 13 Dec 2006 00:11:50 -0000 1.63
@@ -44,8 +44,9 @@ ntfsfix_SOURCES = ntfsfix.c utils.c uti
ntfsfix_LDADD = $(AM_LIBS)
ntfsfix_LDFLAGS = $(AM_LFLAGS)
+mkntfs_CPPFLAGS = $(AM_CPPFLAGS) $(MKNTFS_CPPFLAGS)
mkntfs_SOURCES = attrdef.c attrdef.h upcase.c upcase.h boot.c boot.h sd.c sd.h mkntfs.c utils.c utils.h
-mkntfs_LDADD = $(AM_LIBS)
+mkntfs_LDADD = $(AM_LIBS) $(MKNTFS_LIBS)
mkntfs_LDFLAGS = $(AM_LFLAGS)
ntfslabel_SOURCES = ntfslabel.c utils.c utils.h
Index: mkntfs.8.in
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mkntfs.8.in 6 Feb 2006 01:05:01 -0000 1.25
+++ mkntfs.8.in 13 Dec 2006 00:11:50 -0000 1.26
@@ -127,20 +127,7 @@ Enable compression on the volume.
Specify the size of clusters in bytes. Valid cluster size values are powers of
two, with at least 256, and at most 65536 bytes per cluster. If omitted,
.B mkntfs
-determines the
-.I cluster\-size
-from the volume size. The value is determined as follows:
-.TS
-box;
-lB lB lB
-l l r.
-Volume size Default cluster size
-0 \- 512MB 512 bytes
-512MB \- 1GB 1024 bytes
-1GB \- 2GB 2048 bytes
-2GB + 4096 bytes
-.TE
-.sp
+uses 4096 bytes as the default cluster size.
.sp
Note that the default cluster size is set to be at least equal to the sector
size as a cluster cannot be smaller than a sector. Also, note that values
@@ -150,7 +137,7 @@ by Windows).
.TP
\fB\-N\fR, \fB\-\-ntfs\-version\fR STRING
Select the version of NTFS you wish to create. This can be "1.2"
-(Windows NT 4.0) or "3.1" (Windows XP, Server 2003 and Vista).
+(Windows NT 4.0) or "3.1" (Windows XP, Server 2003, and Vista).
Versions are upwards compatible and Windows 2000, which uses version "3.0",
can read/write both.
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- mkntfs.c 28 Oct 2006 23:45:22 -0000 1.151
+++ mkntfs.c 13 Dec 2006 00:11:50 -0000 1.152
@@ -81,6 +81,10 @@
#ifdef HAVE_LIBGEN_H
#include <libgen.h>
#endif
+#ifdef ENABLE_UUID
+#include <uuid/uuid.h>
+#endif
+
#ifdef HAVE_GETOPT_H
#include <getopt.h>
@@ -2083,6 +2087,34 @@ static int add_attr_file_name(MFT_RECORD
return i;
}
+#ifdef ENABLE_UUID
+
+/**
+ * add_attr_object_id -
+ *
+ * Note we insert only a basic object id which only has the GUID and none of
+ * the extended fields. This is because we currently only use this function
+ * when creating the object id for the volume.
+ *
+ * Return 0 on success or -errno on error.
+ */
+static int add_attr_object_id(MFT_RECORD *m, const GUID *object_id)
+{
+ OBJECT_ID_ATTR oi;
+ int err;
+
+ oi = (OBJECT_ID_ATTR) {
+ .object_id = *object_id,
+ };
+ err = insert_resident_attr_in_mft_record(m, AT_OBJECT_ID, NULL,
+ 0, 0, 0, 0, (u8*)&oi, sizeof(oi.object_id));
+ if (err < 0)
+ ntfs_log_error("add_attr_vol_info failed: %s\n", strerror(-err));
+ return err;
+}
+
+#endif
+
/**
* add_attr_sd
*
@@ -2754,9 +2786,8 @@ do_next:
idx_entry = (INDEX_ENTRY*)((u8*)idx_entry +
le16_to_cpu(idx_entry->length));
}
- } else {
+ } else
return -EINVAL;
- }
memmove((u8*)idx_entry + idx_size, (u8*)idx_entry,
le32_to_cpu(m->bytes_in_use) -
((u8*)idx_entry - (u8*)m));
@@ -3300,6 +3331,56 @@ static int create_hardlink(INDEX_BLOCK *
return 0;
}
+#ifdef ENABLE_UUID
+
+/**
+ * index_obj_id_insert
+ *
+ * Insert an index entry with the key @guid and data pointing to the mft record
+ * @ref in the $O index root of the mft record @m (which must be the mft record
+ * for $ObjId).
+ *
+ * Return 0 on success or -errno on error.
+ */
+static int index_obj_id_insert(MFT_RECORD *m, const GUID *guid,
+ const MFT_REF ref)
+{
+ INDEX_ENTRY *idx_entry_new;
+ int data_ofs, idx_size, err;
+ OBJ_ID_INDEX_DATA *oi;
+
+ /*
+ * Insert the index entry for the object id in the index.
+ *
+ * First determine the size of the index entry to be inserted. This
+ * consists of the index entry header, followed by the index key, i.e.
+ * the GUID, followed by the index data, i.e. OBJ_ID_INDEX_DATA.
+ */
+ data_ofs = (sizeof(INDEX_ENTRY_HEADER) + sizeof(GUID) + 7) & ~7;
+ idx_size = (data_ofs + sizeof(OBJ_ID_INDEX_DATA) + 7) & ~7;
+ idx_entry_new = ntfs_calloc(idx_size);
+ if (!idx_entry_new)
+ return -errno;
+ idx_entry_new->data_offset = cpu_to_le16(data_ofs);
+ idx_entry_new->data_length = cpu_to_le16(sizeof(OBJ_ID_INDEX_DATA));
+ idx_entry_new->length = cpu_to_le16(idx_size);
+ idx_entry_new->key_length = cpu_to_le16(sizeof(GUID));
+ idx_entry_new->key.object_id = *guid;
+ oi = (OBJ_ID_INDEX_DATA*)((u8*)idx_entry_new + data_ofs);
+ oi->mft_reference = ref;
+ err = insert_index_entry_in_res_dir_index(idx_entry_new, idx_size, m,
+ NTFS_INDEX_O, 2, AT_UNUSED);
+ free(idx_entry_new);
+ if (err < 0) {
+ ntfs_log_error("index_obj_id_insert failed inserting index "
+ "entry: %s\n", strerror(-err));
+ return err;
+ }
+ return 0;
+}
+
+#endif
+
/**
* mkntfs_cleanup
*/
@@ -3593,14 +3674,11 @@ static BOOL mkntfs_override_vol_params(n
ntfs_log_debug("volume size = %llikiB\n", volume_size / 1024);
/* If user didn't specify the cluster size, determine it now. */
if (!vol->cluster_size) {
- if (volume_size <= 512LL << 20) /* <= 512MB */
- vol->cluster_size = 512;
- else if (volume_size <= 1LL << 30) /* ]512MB-1GB] */
- vol->cluster_size = 1024;
- else if (volume_size <= 2LL << 30) /* ]1GB-2GB] */
- vol->cluster_size = 2048;
- else
- vol->cluster_size = 4096;
+ /*
+ * Windows Vista always uses 4096 bytes as the default cluster
+ * size regardless of the volume size so we do it, too.
+ */
+ vol->cluster_size = 4096;
/* For small volumes on devices with large sector sizes. */
if (vol->cluster_size < (u32)opts.sector_size)
vol->cluster_size = opts.sector_size;
@@ -4192,11 +4270,16 @@ static BOOL mkntfs_sync_index_record(IND
return TRUE;
}
-
/**
* create_file_volume -
*/
-static BOOL create_file_volume(MFT_RECORD *m, MFT_REF root_ref, VOLUME_FLAGS fl)
+static BOOL create_file_volume(MFT_RECORD *m, MFT_REF root_ref,
+ VOLUME_FLAGS fl
+ , const GUID *volume_guid
+#ifndef ENABLE_UUID
+ __attribute__((unused))
+#endif
+ )
{
int i, err;
u8 *sd;
@@ -4216,14 +4299,21 @@ static BOOL create_file_volume(MFT_RECOR
if (!err)
err = add_attr_vol_name(m, g_vol->vol_name, g_vol->vol_name ?
strlen(g_vol->vol_name) : 0);
+#ifdef ENABLE_UUID
+ if (!err)
+ err = add_attr_object_id(m, volume_guid);
+#endif
if (!err) {
if (fl & VOLUME_IS_DIRTY)
- ntfs_log_quiet("Setting the volume dirty so check disk runs "
- "on next reboot into Windows.\n");
- err = add_attr_vol_info(m, fl, g_vol->major_ver, g_vol->minor_ver);
+ ntfs_log_quiet("Setting the volume dirty so check "
+ "disk runs on next reboot into "
+ "Windows.\n");
+ err = add_attr_vol_info(m, fl, g_vol->major_ver,
+ g_vol->minor_ver);
}
if (err < 0) {
- ntfs_log_error("Couldn't create $Volume: %s\n", strerror(-err));
+ ntfs_log_error("Couldn't create $Volume: %s\n",
+ strerror(-err));
return FALSE;
}
return TRUE;
@@ -4672,7 +4762,11 @@ static BOOL mkntfs_create_root_structure
volume_flags |= VOLUME_IS_DIRTY;
}
free(bs);
- if (!create_file_volume(m, root_ref, volume_flags))
+#ifdef ENABLE_UUID
+ /* Generate a GUID for the volume. */
+ uuid_generate((void*)&g_vol->guid);
+#endif
+ if (!create_file_volume(m, root_ref, volume_flags, &g_vol->guid))
return FALSE;
ntfs_log_verbose("Creating $BadClus (mft record 8)\n");
m = (MFT_RECORD*)(g_buf + 8 * g_vol->mft_record_size);
@@ -4768,7 +4862,7 @@ static BOOL mkntfs_create_root_structure
if (!err)
err = initialize_secure(buf_sds_init, buf_sds_first_size, m);
- free (buf_sds_init);
+ free(buf_sds_init);
buf_sds_init = NULL;
if (err < 0) {
ntfs_log_error("Couldn't create $Secure: %s\n",
@@ -4882,7 +4976,6 @@ static BOOL mkntfs_create_root_structure
ntfs_log_error("Couldn't create $Quota: %s\n", strerror(-err));
return FALSE;
}
-
ntfs_log_verbose("Creating $ObjId (mft record 25)\n");
m = (MFT_RECORD*)(g_buf + 25 * g_vol->mft_record_size);
m->flags |= MFT_RECORD_IS_4;
@@ -4897,12 +4990,18 @@ static BOOL mkntfs_create_root_structure
/* FIXME: This should be IGNORE_CASE */
if (!err)
err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
- COLLATION_NTOFS_ULONGS, g_vol->indx_record_size);
+ COLLATION_NTOFS_ULONGS,
+ g_vol->indx_record_size);
+#ifdef ENABLE_UUID
+ if (!err)
+ err = index_obj_id_insert(m, &g_vol->guid,
+ MK_LE_MREF(FILE_Volume, FILE_Volume));
+#endif
if (err < 0) {
- ntfs_log_error("Couldn't create $ObjId: %s\n", strerror(-err));
+ ntfs_log_error("Couldn't create $ObjId: %s\n",
+ strerror(-err));
return FALSE;
}
-
ntfs_log_verbose("Creating $Reparse (mft record 26)\n");
m = (MFT_RECORD*)(g_buf + 26 * g_vol->mft_record_size);
m->flags |= MFT_RECORD_IS_4;
Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ntfsclone.c 12 Dec 2006 19:00:01 -0000 1.97
+++ ntfsclone.c 13 Dec 2006 00:11:50 -0000 1.98
@@ -1717,7 +1717,7 @@ static void check_dest_free_space(u64 sr
{
u64 dest_bytes;
struct statvfs stvfs;
- struct stat stat;
+ struct stat st;
if (opt.metadata || opt.blkdev_out || opt.std_out)
return;
@@ -1732,8 +1732,8 @@ static void check_dest_free_space(u64 sr
}
/* If file is a FIFO then there is no point in checking the size. */
- if (!fstat(fd_out, &stat)) {
- if (S_ISFIFO(stat.st_mode))
+ if (!fstat(fd_out, &st)) {
+ if (S_ISFIFO(st.st_mode))
return;
} else
Printf("WARNING: fstat failed: %s\n", strerror(errno));
|
|
From: Anton A. <ai...@de...> - 2006-12-13 00:11:58
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv32753/libntfs
Modified Files:
dir.c logging.c
Log Message:
- mkntfs: Generate a random DCE compliant UUID for the created volume
and include --with-uuid[=PFX] and --without-uuid options. (Anton)
- configure.ac: Set language to C. (Anton)
- mkntfs: Always set default cluster size to 4096 bytes regardless of
volume size. This is what Windows Vista does and it makes perfect
sense from a performance point of view. (Anton)
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- dir.c 12 Dec 2006 15:02:25 -0000 1.83
+++ dir.c 13 Dec 2006 00:11:50 -0000 1.84
@@ -596,7 +596,6 @@ static const ntfschar dotdot[3] = { cons
/**
* ntfs_filldir - ntfs specific filldir method
- * @dir_ni: ntfs inode of current directory
* @pos: current position in directory
* @ie: current index entry
* @dirent: context for filldir callback supplied by the caller
@@ -605,7 +604,7 @@ static const ntfschar dotdot[3] = { cons
* Pass information specifying the current directory entry @ie to the @filldir
* callback.
*/
-static int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, INDEX_ENTRY *ie,
+static int ntfs_filldir(s64 *pos, INDEX_ENTRY *ie,
void *dirent, ntfs_filldir_t filldir)
{
FILE_NAME_ATTR *fn = &ie->key.file_name;
@@ -857,7 +856,7 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
* Submit the directory entry to ntfs_filldir(), which will
* invoke the filldir() callback as appropriate.
*/
- rc = ntfs_filldir(dir_ni, pos, ie, dirent, filldir);
+ rc = ntfs_filldir(pos, ie, dirent, filldir);
if (rc) {
ntfs_attr_put_search_ctx(ctx);
ctx = NULL;
@@ -1018,7 +1017,7 @@ find_next_index_buffer:
* Submit the directory entry to ntfs_filldir(), which will
* invoke the filldir() callback as appropriate.
*/
- rc = ntfs_filldir(dir_ni, pos, ie, dirent, filldir);
+ rc = ntfs_filldir(pos, ie, dirent, filldir);
if (rc)
goto done;
}
Index: logging.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/logging.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- logging.c 1 Nov 2006 14:05:09 -0000 1.13
+++ logging.c 13 Dec 2006 00:11:50 -0000 1.14
@@ -71,18 +71,20 @@ struct ntfs_logging {
/**
* ntfs_log - This struct controls all the logging in the library and tools.
*/
-static struct ntfs_logging ntfs_log = {
+static struct ntfs_logging ntfs_log = (struct ntfs_logging) {
+ .levels = NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET |
+ NTFS_LOG_LEVEL_WARNING | NTFS_LOG_LEVEL_ERROR |
+ NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
+ NTFS_LOG_LEVEL_PROGRESS |
#ifdef DEBUG
- NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE |
+ NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE |
#endif
- NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET | NTFS_LOG_LEVEL_WARNING |
- NTFS_LOG_LEVEL_ERROR | NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
- NTFS_LOG_LEVEL_PROGRESS,
- NTFS_LOG_FLAG_ONLYNAME,
+ 0,
+ .flags = NTFS_LOG_FLAG_ONLYNAME,
#ifdef DEBUG
- ntfs_log_handler_outerr
+ .handler = ntfs_log_handler_outerr,
#else
- ntfs_log_handler_null
+ .handler = ntfs_log_handler_null,
#endif
};
@@ -343,8 +345,10 @@ int ntfs_log_redirect(const char *functi
#ifdef HAVE_SYSLOG_H
int ntfs_log_handler_syslog(const char *function __attribute__((unused)),
- const char *file, __attribute__((unused)) int line, u32 level,
- void *data __attribute__((unused)), const char *format, va_list args)
+ const char *file, int line __attribute__((unused)),
+ u32 level __attribute__((unused)),
+ void *data __attribute__((unused)), const char *format,
+ va_list args)
{
int ret = 0;
int olderr = errno;
|
|
From: Anton A. <ai...@de...> - 2006-12-13 00:11:58
|
Changes by: aia21 Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv32753 Modified Files: ChangeLog configure.ac Log Message: - mkntfs: Generate a random DCE compliant UUID for the created volume and include --with-uuid[=PFX] and --without-uuid options. (Anton) - configure.ac: Set language to C. (Anton) - mkntfs: Always set default cluster size to 4096 bytes regardless of volume size. This is what Windows Vista does and it makes perfect sense from a performance point of view. (Anton) Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.430 retrieving revision 1.431 diff -u -p -r1.430 -r1.431 --- ChangeLog 9 Dec 2006 14:01:12 -0000 1.430 +++ ChangeLog 13 Dec 2006 00:11:50 -0000 1.431 @@ -106,6 +106,12 @@ xx/xx/2006 - x.xx.x - . Adapt unix_io pread()/pwrite() device operations to use pread()/ pwrite() system call and adapt win32_io device operations to not supply pread()/pwrite(). (Csaba Henk, Anton) + - mkntfs: Generate a random DCE compliant UUID for the created volume + and include --with-uuid[=PFX] and --without-uuid options. (Anton) + - configure.ac: Set language to C. (Anton) + - mkntfs: Always set default cluster size to 4096 bytes regardless of + volume size. This is what Windows Vista does and it makes perfect + sense from a performance point of view. (Anton) 21/06/2006 - 1.13.1 - Various fixes. Index: configure.ac =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v retrieving revision 1.115 retrieving revision 1.116 diff -u -p -r1.115 -r1.116 --- configure.ac 3 Dec 2006 14:19:29 -0000 1.115 +++ configure.ac 13 Dec 2006 00:11:50 -0000 1.116 @@ -53,6 +53,7 @@ AC_INIT([ntfsprogs],[1.13.2-WIP],[linux- LTVERSION_LIBNTFS="10:0:0" AC_SUBST(LTVERSION_LIBNTFS) +AC_LANG([C]) AC_CANONICAL_HOST([]) AC_CANONICAL_TARGET([]) AC_CONFIG_SRCDIR([config.h.in]) @@ -241,6 +242,42 @@ all_includes="$all_includes $USER_INCLUD AC_SUBST(all_includes) AC_SUBST(all_libraries) +# Specify support for generating DCE compliant UUIDs (aka GUIDs). We check if +# uuid/uuid.h header is present and the uuid library is present that goes with +# it and then check if uuid_generate() is present and usable. +# +# DCE UUIDs are enabled by default and can be disabled with the --disable-uuid +# option to the configure script. +AC_ARG_WITH(uuid, [ + --with-uuid@<:@=PFX@:>@ generate DCE compliant UUIDs, with optional prefix + to uuid library and headers @<:@default=detect@:>@ + --without-uuid do not generate DCE compliant UUIDs], + if test "$with_uuid" = "yes"; then + extrapath=default + elif test "$with_uuid" = "no"; then + extrapath= + else + extrapath=$with_uuid + fi, + extrapath=default +) +if test "x$extrapath" != "x"; then + if test "x$extrapath" != "xdefault"; then + MKNTFS_CPPFLAGS="$MKNTFS_CPPFLAGS -I$extrapath/include" + MKNTFS_LIBS="$MKNTFS_LIBS -L$extrapath/lib" + fi + AC_CHECK_HEADER([uuid/uuid.h], + AC_CHECK_LIB([uuid], [uuid_generate], + AC_DEFINE([ENABLE_UUID], 1, + [Define this to 1 if you want to enable generation of + DCE compliant UUIDs.]) + MKNTFS_LIBS="$MKNTFS_LIBS -luuid", + AC_MSG_WARN([Linux-NTFS DCE compliant UUID generation code requires the uuid library.]), + ), + AC_MSG_WARN([Linux-NTFS DCE compliant UUID generation code requires the uuid library.]), + ) +fi + # Get compiler name if test ! -z "$CC"; then _cc="$CC" @@ -292,6 +329,9 @@ AC_SUBST(LIBNTFS_CFLAGS) AC_SUBST(LIBNTFS_GNOMEVFS_CFLAGS) AC_SUBST(LIBNTFS_GNOMEVFS_LIBS) +AC_SUBST(MKNTFS_CPPFLAGS) +AC_SUBST(MKNTFS_LIBS) + AC_SUBST(AUTODIRS) # Checks for libraries. |
|
From: Yura P. <yu...@de...> - 2006-12-12 20:27:42
|
Changes by: yura Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs In directory delta357:/tmp/cvs-serv10644/include/ntfs Modified Files: types.h Log Message: Workaround for this bogus s64 warnings. Thanks, Linus! Index: types.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/types.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- types.h 12 Dec 2006 15:02:25 -0000 1.18 +++ types.h 12 Dec 2006 20:27:32 -0000 1.19 @@ -35,6 +35,10 @@ #include <sys/types.h> #endif +#ifdef __CHECKER__ +typedef int __attribute__((__mode__(__DI__))) int64_t; +#endif + typedef uint8_t u8; /* Unsigned types of an exact size */ typedef uint16_t u16; typedef uint32_t u32; |
|
From: Yura P. <yu...@de...> - 2006-12-12 19:00:19
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv1448/ntfsprogs
Modified Files:
attrdef.c boot.c ntfsclone.c ntfscmp.c ntfsfix.c ntfsresize.c
Log Message:
more sparse fixes
left only endianness and this stupid problems with s64
Index: attrdef.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/attrdef.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- attrdef.c 26 Oct 2005 20:47:14 -0000 1.5
+++ attrdef.c 12 Dec 2006 19:00:01 -0000 1.6
@@ -1,3 +1,5 @@
+#include "attrdef.h"
+
/**
* attrdef_ntfs12_array
*/
Index: boot.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/boot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- boot.c 26 Oct 2005 20:47:14 -0000 1.3
+++ boot.c 12 Dec 2006 19:00:01 -0000 1.4
@@ -1,3 +1,5 @@
+#include "boot.h"
+
/**
* boot_array - the first 3429 bytes of $Boot
* The first 3429 bytes of $Boot. The rest is just zero. Total 8192 bytes.
Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ntfsclone.c 3 Dec 2006 18:26:58 -0000 1.96
+++ ntfsclone.c 12 Dec 2006 19:00:01 -0000 1.97
@@ -95,7 +95,7 @@ static const char *dirty_volume_msg =
"Volume '%s' is scheduled for a check or it was shutdown \n"
"uncleanly. Please boot Windows or use the --force option to progress.\n";
-struct {
+static struct {
int verbose;
int quiet;
int debug;
@@ -139,19 +139,19 @@ struct ntfs_walk_cluster {
};
-ntfs_volume *vol = NULL;
-struct bitmap lcn_bitmap;
+static ntfs_volume *vol = NULL;
+static struct bitmap lcn_bitmap;
-int fd_in;
-int fd_out;
-FILE *msg_out = NULL;
-
-int wipe = 0;
-unsigned int nr_used_mft_records = 0;
-unsigned int wiped_unused_mft_data = 0;
-unsigned int wiped_unused_mft = 0;
-unsigned int wiped_resident_data = 0;
-unsigned int wiped_timestamp_data = 0;
+static int fd_in;
+static int fd_out;
+static FILE *msg_out = NULL;
+
+static int wipe = 0;
+static unsigned int nr_used_mft_records = 0;
+static unsigned int wiped_unused_mft_data = 0;
+static unsigned int wiped_unused_mft = 0;
+static unsigned int wiped_resident_data = 0;
+static unsigned int wiped_timestamp_data = 0;
static BOOL image_is_host_endian = FALSE;
@@ -176,7 +176,7 @@ static BOOL image_is_host_endian = FALSE
#define NTFSCLONE_IMG_VER_MINOR 0
/* All values are in little endian. */
-struct {
+static struct {
char magic[IMAGE_MAGIC_SIZE];
u8 major_ver;
u8 minor_ver;
@@ -1406,7 +1406,7 @@ static void mount_volume(unsigned long n
volume_size(vol, vol->nr_clusters));
}
-struct ntfs_walk_cluster backup_clusters = { NULL, NULL };
+static struct ntfs_walk_cluster backup_clusters = { NULL, NULL };
static int device_offset_valid(int fd, s64 ofs)
{
Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfscmp.c 12 Nov 2006 22:46:50 -0000 1.21
+++ ntfscmp.c 12 Dec 2006 19:00:01 -0000 1.22
@@ -39,7 +39,7 @@ static const char *hibernated_volume_msg
"turned off properly\n";
-struct {
+static struct {
int debug;
int show_progress;
int verbose;
@@ -309,7 +309,7 @@ static inline s64 get_nr_mft_records(ntf
#define NTFSCMP_EXTENSION_RECORD 4
#define NTFSCMP_INODE_CLOSE_ERROR 5
-const char *ntfscmp_errs[] = {
+static const char *ntfscmp_errs[] = {
"OK",
"INODE_OPEN_ERROR",
"INODE_OPEN_IO_ERROR",
Index: ntfsfix.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ntfsfix.c 11 Dec 2006 10:41:34 -0000 1.36
+++ ntfsfix.c 12 Dec 2006 19:00:01 -0000 1.37
@@ -83,7 +83,7 @@ static const char *EXEC_NAME = "ntfsfix"
static const char *OK = "OK\n";
static const char *FAILED = "FAILED\n";
-struct {
+static struct {
char *volume;
} opt;
Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- ntfsresize.c 11 Dec 2006 10:41:34 -0000 1.128
+++ ntfsresize.c 12 Dec 2006 19:00:01 -0000 1.129
@@ -125,7 +125,7 @@ static const char *many_bad_sectors_msg
"* other reason. We suggest to get a replacement disk as soon as possible. *\n"
"***************************************************************************\n";
-struct {
+static struct {
int verbose;
int debug;
int ro_flag;
@@ -200,7 +200,7 @@ typedef struct {
/* FIXME: This, lcn_bitmap and pos from find_free_cluster() will make a cluster
allocation related structure, attached to ntfs_resize_t */
-s64 max_free_cluster_range = 0;
+static s64 max_free_cluster_range = 0;
#define NTFS_MBYTE (1000 * 1000)
|
|
From: Yura P. <yu...@de...> - 2006-12-12 19:00:19
|
Changes by: yura Update of /cvs/linux-ntfs/ntfsprogs/libntfs In directory delta357:/tmp/cvs-serv1448/libntfs Modified Files: gnome-vfs-module.c Log Message: more sparse fixes left only endianness and this stupid problems with s64 Index: gnome-vfs-module.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/gnome-vfs-module.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- gnome-vfs-module.c 19 Jun 2005 21:09:40 -0000 1.4 +++ gnome-vfs-module.c 12 Dec 2006 19:00:00 -0000 1.5 @@ -28,9 +28,6 @@ #include <glib/gmessages.h> #include <glib/gutils.h> /* for g_atexit() */ -/* Filesystem-module-scope lock for _any_ libntfs access. */ -G_LOCK_DEFINE(libntfs); - static void vfs_module_shutdown_atexit(void); /** |
|
From: Yura P. <yu...@de...> - 2006-12-12 15:44:59
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv14717/ntfsprogs
Modified Files:
ntfscp.c ntfsinfo.c
Log Message:
fix some sparse warnings
btw, it looks like sparse loses it head when it see something like:
void foo(s64 *bar)
{
...
}
...
{
s64 baz;
foo(&baz);
...
}
Index: ntfscp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ntfscp.c 28 Nov 2006 10:09:57 -0000 1.40
+++ ntfscp.c 12 Dec 2006 15:44:52 -0000 1.41
@@ -72,7 +72,7 @@ struct options {
static const char *EXEC_NAME = "ntfscp";
static struct options opts;
-volatile sig_atomic_t caught_terminate = 0;
+static volatile sig_atomic_t caught_terminate = 0;
/**
* version - Print version information about the program
Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- ntfsinfo.c 28 Nov 2006 10:09:57 -0000 1.155
+++ ntfsinfo.c 12 Dec 2006 15:44:53 -0000 1.156
@@ -985,7 +985,7 @@ static void ntfs_dump_attr_security_desc
if (attr->non_resident) {
/* FIXME: We don't handle fragmented mapping pairs case. */
- runlist *rl = ntfs_mapping_pairs_decompress(vol, attr, 0);
+ runlist *rl = ntfs_mapping_pairs_decompress(vol, attr, NULL);
if (rl) {
s64 data_size, bytes_read;
@@ -1282,7 +1282,7 @@ static void ntfs_dump_attribute_header(A
}
if (opts.verbose) {
- runlist *rl = ntfs_mapping_pairs_decompress(vol, a, 0);
+ runlist *rl = ntfs_mapping_pairs_decompress(vol, a, NULL);
if (rl) {
runlist *rlc = rl;
// TODO: Switch this to properly aligned hex...
@@ -1878,7 +1878,7 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
if (!opts.verbose)
return;
/* FIXME: We don't handle fragmented mapping pairs case. */
- rl = ntfs_mapping_pairs_decompress(vol, attr, 0);
+ rl = ntfs_mapping_pairs_decompress(vol, attr, NULL);
if (rl) {
s64 bytes_read;
|
|
From: Yura P. <yu...@de...> - 2006-12-12 15:02:38
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv10367/include/ntfs
Modified Files:
types.h
Log Message:
fix sparse errors. and first steps towards endianness checking
Index: types.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/types.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- types.h 28 Oct 2006 23:46:30 -0000 1.17
+++ types.h 12 Dec 2006 15:02:25 -0000 1.18
@@ -45,17 +45,23 @@ typedef int16_t s16;
typedef int32_t s32;
typedef int64_t s64;
-typedef u16 le16;
-typedef u32 le32;
-typedef u64 le64;
+#ifdef __CHECKER__
+#define __bitwise __attribute__((bitwise))
+#else
+#define __bitwise
+#endif
+
+typedef u16 __bitwise le16;
+typedef u32 __bitwise le32;
+typedef u64 __bitwise le64;
/*
* Declare sle{16,32,64} to be unsigned because we do not want sign extension
* on BE architectures.
*/
-typedef u16 sle16;
-typedef u32 sle32;
-typedef u64 sle64;
+typedef u16 __bitwise sle16;
+typedef u32 __bitwise sle32;
+typedef u64 __bitwise sle64;
typedef u16 ntfschar; /* 2-byte Unicode character type. */
#define UCHAR_T_SIZE_BITS 1
|
|
From: Yura P. <yu...@de...> - 2006-12-12 15:02:37
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv10367/libntfs
Modified Files:
dir.c unistr.c
Log Message:
fix sparse errors. and first steps towards endianness checking
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- dir.c 11 Dec 2006 03:16:22 -0000 1.82
+++ dir.c 12 Dec 2006 15:02:25 -0000 1.83
@@ -594,29 +594,10 @@ static const ntfschar dotdot[3] = { cons
const_cpu_to_le16('.'),
const_cpu_to_le16('\0') };
-/*
- * union index_union - Helper for ntfs_readdir().
- */
-typedef union {
- INDEX_ROOT *ir;
- INDEX_ALLOCATION *ia;
-} index_union __attribute__((__transparent_union__));
-
-/**
- * enum INDEX_TYPE - Helper for ntfs_readdir().
- */
-typedef enum {
- INDEX_TYPE_ROOT, /* index root */
- INDEX_TYPE_ALLOCATION, /* index allocation */
-} INDEX_TYPE;
-
/**
* ntfs_filldir - ntfs specific filldir method
* @dir_ni: ntfs inode of current directory
* @pos: current position in directory
- * @ivcn_bits: log(2) of index vcn size
- * @index_type: specifies whether @iu is an index root or an index allocation
- * @iu: index root or index block to which @ie belongs
* @ie: current index entry
* @dirent: context for filldir callback supplied by the caller
* @filldir: filldir callback supplied by the caller
@@ -624,8 +605,7 @@ typedef enum {
* Pass information specifying the current directory entry @ie to the @filldir
* callback.
*/
-static int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
- const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
+static int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, INDEX_ENTRY *ie,
void *dirent, ntfs_filldir_t filldir)
{
FILE_NAME_ATTR *fn = &ie->key.file_name;
@@ -633,13 +613,6 @@ static int ntfs_filldir(ntfs_inode *dir_
ntfs_log_trace("Entering.\n");
- /* Advance the position even if going to skip the entry. */
- if (index_type == INDEX_TYPE_ALLOCATION)
- *pos = (u8*)ie - (u8*)iu.ia + (sle64_to_cpu(
- iu.ia->index_block_vcn) << ivcn_bits) +
- dir_ni->vol->mft_record_size;
- else /* if (index_type == INDEX_TYPE_ROOT) */
- *pos = (u8*)ie - (u8*)iu.ir;
/* Skip root directory self reference entry. */
if (MREF_LE(ie->indexed_file) == FILE_root)
return 0;
@@ -770,9 +743,10 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
ia_na = ntfs_attr_open(dir_ni, AT_INDEX_ALLOCATION, NTFS_INDEX_I30, 4);
if (!ia_na) {
if (errno != ENOENT) {
- ntfs_log_perror("Failed to open index allocation attribute. "
- "Directory inode 0x%llx is corrupt or bug",
- (unsigned long long)dir_ni->mft_no);
+ ntfs_log_perror("Failed to open index allocation "
+ "attribute. Directory inode 0x%llx is "
+ "corrupt or bug", (unsigned long long)
+ dir_ni->mft_no);
return -1;
}
i_size = 0;
@@ -877,12 +851,13 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
/* Skip index root entry if continuing previous readdir. */
if (ir_pos > (u8*)ie - (u8*)ir)
continue;
+ /* Advance the position even if going to skip the entry. */
+ *pos = (u8*)ie - (u8*)ir;
/*
* Submit the directory entry to ntfs_filldir(), which will
* invoke the filldir() callback as appropriate.
*/
- rc = ntfs_filldir(dir_ni, pos, index_vcn_size_bits,
- INDEX_TYPE_ROOT, ir, ie, dirent, filldir);
+ rc = ntfs_filldir(dir_ni, pos, ie, dirent, filldir);
if (rc) {
ntfs_attr_put_search_ctx(ctx);
ctx = NULL;
@@ -1035,12 +1010,15 @@ find_next_index_buffer:
/* Skip index entry if continuing previous readdir. */
if (ia_pos - ia_start > (u8*)ie - (u8*)ia)
continue;
+ /* Advance the position even if going to skip the entry. */
+ *pos = (u8*)ie - (u8*)ia + (sle64_to_cpu(
+ ia->index_block_vcn) << index_vcn_size_bits) +
+ dir_ni->vol->mft_record_size;
/*
* Submit the directory entry to ntfs_filldir(), which will
* invoke the filldir() callback as appropriate.
*/
- rc = ntfs_filldir(dir_ni, pos, index_vcn_size_bits,
- INDEX_TYPE_ALLOCATION, ia, ie, dirent, filldir);
+ rc = ntfs_filldir(dir_ni, pos, ie, dirent, filldir);
if (rc)
goto done;
}
Index: unistr.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- unistr.c 17 Nov 2006 22:51:29 -0000 1.38
+++ unistr.c 12 Dec 2006 15:02:25 -0000 1.39
@@ -302,7 +302,7 @@ ntfschar *ntfs_ucsndup(const ntfschar *s
dst = ntfs_malloc((len + 1) * sizeof(ntfschar));
if (dst) {
memcpy(dst, s, len * sizeof(ntfschar));
- dst[len] = cpu_to_le16(L'\0');
+ dst[len] = 0;
}
return dst;
}
@@ -623,7 +623,7 @@ int ntfs_mbstoucs(const char *ins, ntfsc
}
#endif
/* Now write the NULL character. */
- ucs[o] = cpu_to_le16(L'\0');
+ ucs[o] = 0;
if (*outs != ucs)
*outs = ucs;
return o;
|
|
From: Yura P. <yu...@de...> - 2006-12-12 15:02:36
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv10367/ntfsprogs
Modified Files:
ntfslabel.c utils.c
Log Message:
fix sparse errors. and first steps towards endianness checking
Index: ntfslabel.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ntfslabel.c 12 Nov 2006 22:46:50 -0000 1.22
+++ ntfslabel.c 12 Dec 2006 15:02:25 -0000 1.23
@@ -326,7 +326,7 @@ static int change_label(ntfs_volume *vol
"allowed. Truncating excess characters.\n",
(unsigned)(0x100 / sizeof(ntfschar)));
label_len = 0x100;
- new_label[label_len / sizeof(ntfschar)] = cpu_to_le16(L'\0');
+ new_label[label_len / sizeof(ntfschar)] = 0;
}
if (a) {
if (resize_resident_attribute_value(ctx->mrec, a, label_len)) {
Index: utils.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- utils.c 28 Nov 2006 10:09:57 -0000 1.70
+++ utils.c 12 Dec 2006 15:02:25 -0000 1.71
@@ -441,11 +441,12 @@ ATTR_RECORD * find_first_attribute(const
* if parent is 5 (/) stop
* get inode of parent
*/
+#define max_path 20
int utils_inode_get_name(ntfs_inode *inode, char *buffer, int bufsize)
{
// XXX option: names = posix/win32 or dos
// flags: path, filename, or both
- const int max_path = 20;
+
ntfs_volume *vol;
ntfs_attr_search_ctx *ctx;
@@ -555,6 +556,7 @@ int utils_inode_get_name(ntfs_inode *ino
return 1;
}
+#undef max_path
/**
* utils_attr_get_name
|
|
From: Anton A. <ai...@de...> - 2006-12-11 10:41:56
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv359/ntfsprogs
Modified Files:
ntfsfix.8.in ntfsfix.c ntfsresize.c
Log Message:
Szaka prefers to have the lofgile reset and dirty bit setting done even if they
are already done so remove the conditionals I added.
Index: ntfsfix.8.in
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsfix.8.in 6 Feb 2006 01:05:01 -0000 1.15
+++ ntfsfix.8.in 11 Dec 2006 10:41:34 -0000 1.16
@@ -14,14 +14,14 @@ is a utility that fixes some common NTFS
.B ntfsfix
is
.B NOT
-a Linux version of chkdsk. It only repairs some fundamental NTFS
+a Linux version of chkdsk. It only repairs some fundamental NTFS
inconsistencies, resets the NTFS journal file and schedules an NTFS consistency
check for the first boot into Windows.
.sp
You may run
.B ntfsfix
on an NTFS volume if you think it was damaged by Windows or some other way
-and it can't be mounted.
+and it cannot be mounted.
.SH OPTIONS
Below is a summary of all the options that
.B ntfsfix
Index: ntfsfix.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ntfsfix.c 9 Dec 2006 11:27:37 -0000 1.35
+++ ntfsfix.c 11 Dec 2006 10:41:34 -0000 1.36
@@ -259,8 +259,8 @@ static int set_dirty_flag(ntfs_volume *v
return -1;
}
vol->flags = flags;
- ntfs_log_info(OK);
NVolSetWasDirty(vol);
+ ntfs_log_info(OK);
return 0;
}
Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- ntfsresize.c 3 Dec 2006 08:59:57 -0000 1.127
+++ ntfsresize.c 11 Dec 2006 10:41:34 -0000 1.128
@@ -2289,25 +2289,19 @@ static ntfs_volume *mount_volume(void)
*/
static void prepare_volume_fixup(ntfs_volume *vol)
{
- /* No need to schedule chkdsk if it is already scheduled. */
- if (!NVolWasDirty(vol)) {
- printf("Schedule chkdsk for NTFS consistency check at Windows "
- "boot time ...\n");
- vol->flags |= VOLUME_IS_DIRTY;
- if (ntfs_volume_write_flags(vol, vol->flags))
- perr_exit("Failed to set the volume dirty");
- NVolSetWasDirty(vol);
- if (vol->dev->d_ops->sync(vol->dev) == -1)
- perr_exit("Failed to sync device");
- }
- /* No need to empty the journal if it is already empty. */
- if (!NVolLogFileEmpty(vol)) {
- printf("Resetting $LogFile ... (this might take a while)\n");
- if (ntfs_logfile_reset(vol))
- perr_exit("Failed to reset $LogFile");
- if (vol->dev->d_ops->sync(vol->dev) == -1)
- perr_exit("Failed to sync device");
- }
+ printf("Schedule chkdsk for NTFS consistency check at Windows boot "
+ "time ...\n");
+ vol->flags |= VOLUME_IS_DIRTY;
+ if (ntfs_volume_write_flags(vol, vol->flags))
+ perr_exit("Failed to set the volume dirty");
+ NVolSetWasDirty(vol);
+ if (vol->dev->d_ops->sync(vol->dev) == -1)
+ perr_exit("Failed to sync device");
+ printf("Resetting $LogFile ... (this might take a while)\n");
+ if (ntfs_logfile_reset(vol))
+ perr_exit("Failed to reset $LogFile");
+ if (vol->dev->d_ops->sync(vol->dev) == -1)
+ perr_exit("Failed to sync device");
}
static void set_disk_usage_constraint(ntfs_resize_t *resize)
|
|
From: Yura P. <yu...@de...> - 2006-12-11 03:16:41
|
Changes by: yura
Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv18111/include/ntfs
Modified Files:
layout.h
Log Message:
fix clusters per index block calculation (Szaka)
Index: layout.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- layout.h 11 Dec 2006 03:02:23 -0000 1.62
+++ layout.h 11 Dec 2006 03:16:22 -0000 1.63
@@ -2111,14 +2111,10 @@ typedef struct {
this must be COLLATION_FILE_NAME. */
u32 index_block_size; /* Size of each index block in bytes (in
the index allocation attribute). */
- s8 clusters_per_index_block; /* Cluster size of each index block (in
+ u8 clusters_per_index_block; /* Cluster size of each index block (in
the index allocation attribute), when
an index block is >= than a cluster,
- otherwise this will be the -log of
- the size (like how the encoding of
- the mft record size and the index
- record size found in the boot sector
- work). Has to be a power of 2. */
+ otherwise sectors per index block. */
u8 reserved[3]; /* Reserved/align to 8-byte boundary. */
INDEX_HEADER index; /* Index header describing the
following index entries. */
|
