opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stupidness introduced in latest changesets. Thanks to Yuval for comments.

edge.strict_endians
cha0smaster 2005-11-08 19:49:52 +00:00
parent 2c3dfcba27
commit 1254b2951c
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -71,7 +71,7 @@ xx/xx/2005 - 1.12.2-WIP
starting to clone or restore. (Szaka)
- Change @type parameter for ntfs_create() to be dev_t rather than
internal NTFS_DT_* constants. (Yura)
- Teech ntfs_create() to create special Interix files (charcter and
- Teach ntfs_create() to create special Interix files (charcter and
block devices, FIFOs and sockets). Add @dev parameter to ntfs_create()
for this. (Yura)

14
libntfs/dir.c
View File

@ -1086,7 +1086,7 @@ err_out:
* S_IFCHR to create character device
* S_IFIFO to create FIFO
* S_IFSOCK to create socket
* other valuer are invalid.
* other values are invalid.
*
* @dev is only used if @type is S_IFBLK or S_IFCHR, in other cases it's value
* is ignored.
@ -1132,7 +1132,7 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len,
si->last_data_change_time = utc2ntfs(ni->last_data_change_time);
si->last_mft_change_time = utc2ntfs(ni->last_mft_change_time);
si->last_access_time = utc2ntfs(ni->last_access_time);
if (type != S_IFREG && type != S_IFDIR) {
if (!S_ISREG(type) && !S_ISDIR(type)) {
si->file_attributes = FILE_ATTR_SYSTEM;
ni->flags = FILE_ATTR_SYSTEM;
}
@ -1143,7 +1143,7 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len,
ntfs_log_error("Failed to add STANDARD_INFORMATION attribute.");
goto err_out;
}
if (type == S_IFDIR) {
if (S_ISDIR(type)) {
INDEX_ROOT *ir = NULL;
INDEX_ENTRY *ie;
int ir_len, index_len;
@ -1208,7 +1208,7 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len,
data = NULL;
data_len = 1;
break;
default:
default: /* FIFO or regular file. */
data = NULL;
data_len = 0;
break;
@ -1235,9 +1235,9 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len,
le16_to_cpu(dir_ni->mrec->sequence_number));
fn->file_name_length = name_len;
fn->file_name_type = FILE_NAME_POSIX;
if (type == S_IFDIR)
if (S_ISDIR(type))
fn->file_attributes = FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
if (type != S_IFREG && type != S_IFDIR)
if (!S_ISREG(type) && !S_ISDIR(type))
fn->file_attributes = FILE_ATTR_SYSTEM;
fn->creation_time = utc2ntfs(ni->creation_time);
fn->last_data_change_time = utc2ntfs(ni->last_data_change_time);
@ -1259,7 +1259,7 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len,
}
/* Set hard links count and directory flag. */
ni->mrec->link_count = cpu_to_le16(1);
if (type == S_IFDIR)
if (S_ISDIR(type))
ni->mrec->flags |= MFT_RECORD_IS_DIRECTORY;
ntfs_inode_mark_dirty(ni);
/* Done! */

5
ntfsprogs/ntfsmount.c
View File

@ -782,13 +782,10 @@ static int ntfs_fuse_mknod(const char *org_path, mode_t mode, dev_t dev)
int stream_name_len;
int res = 0;
if (mode && !(mode &
(S_IFREG | S_IFIFO | S_IFSOCK | S_IFCHR | S_IFBLK)))
return -EOPNOTSUPP;
stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
if (stream_name_len < 0)
return stream_name_len;
if (stream_name_len && mode && !(mode & S_IFREG)) {
if (stream_name_len && !S_ISREG(mode)) {
res = -EINVAL;
goto exit;
}