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

Developed the removal of a DOS name

N2009_11_14_FIXES
jpandre 2009-08-14 14:46:46 +00:00
parent 5bee9d73f0
commit c085f70be1
3 changed files with 104 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ntfs-3g/dir.h
View File

@ -109,6 +109,7 @@ int ntfs_get_ntfs_dos_name(const char *path,
int ntfs_set_ntfs_dos_name(const char *path,
const char *value, size_t size, int flags,
ntfs_inode *ni);
int ntfs_remove_ntfs_dos_name(const char *path, ntfs_inode *ni);
#endif /* defined _NTFS_DIR_H */

89
libntfs-3g/dir.c
View File

@ -2195,4 +2195,93 @@ int ntfs_set_ntfs_dos_name(const char *path, const char *value, size_t size,
return (res ? -1 : 0);
}
/*
* Delete the ntfs DOS name
*/
int ntfs_remove_ntfs_dos_name(const char *path, ntfs_inode *ni)
{
int res;
int oldnametype;
int longlen = 0;
int shortlen;
u64 dnum;
ntfs_volume *vol;
BOOL deleted = FALSE;
ntfschar shortname[MAX_DOS_NAME_LENGTH];
ntfschar *longname = NULL;
ntfs_inode *dir_ni = NULL;
char *dirname = (char*)NULL;
const char *rdirname;
char *p;
res = -1;
vol = ni->vol;
/* get the parent directory */
dirname = strdup(path);
if (dirname) {
p = strrchr(dirname,'/');
if (p) {
*p++ = 0;
longlen = ntfs_mbstoucs(p, &longname);
rdirname = (dirname[0] ? dirname : "/");
dir_ni = ntfs_pathname_to_inode(vol, NULL, rdirname);
}
}
if (dir_ni) {
dnum = dir_ni->mft_no;
shortlen = get_dos_name(ni, dnum, shortname);
if (shortlen >= 0) {
/* migrate the long name as Posix */
oldnametype = set_namespace(ni,dir_ni,longname,longlen,
FILE_NAME_POSIX);
switch (oldnametype) {
case FILE_NAME_WIN32_AND_DOS :
/* name was Win32+DOS : done */
res = 0;
break;
case FILE_NAME_DOS :
/* name was DOS, make it back to DOS */
set_namespace(ni,dir_ni,longname,longlen,
FILE_NAME_DOS);
errno = ENOENT;
break;
case FILE_NAME_WIN32 :
/* name was Win32, make it Posix and delete */
if (set_namespace(ni,dir_ni,shortname,shortlen,
FILE_NAME_POSIX) >= 0) {
if (!ntfs_delete(vol,
(const char*)NULL, ni,
dir_ni, shortname,
shortlen))
res = 0;
deleted = TRUE;
} else {
/*
* DOS name has been found, but cannot
* migrate to Posix : something bad
* has happened
*/
errno = EIO;
ntfs_log_error("Could not change"
" DOS name of %s to Posix\n",
path);
}
break;
default :
/* name was Posix or not found : error */
errno = ENOENT;
break;
}
}
if (!deleted)
ntfs_inode_close(dir_ni);
}
if (!deleted)
ntfs_inode_close(ni);
free(longname);
free(dirname);
return (res);
}
#endif

14
src/ntfs-3g.c
View File

@ -2882,6 +2882,13 @@ static int ntfs_fuse_removexattr(const char *path, const char *name)
res = -errno;
break;
case XATTR_NTFS_DOS_NAME:
ni = ntfs_check_access_xattr(&security,path,attr,TRUE);
if (ni) {
if (ntfs_remove_ntfs_dos_name(path,ni))
res = -errno;
} else
res = -errno;
break;
default :
errno = EOPNOTSUPP;
res = -errno;
@ -2925,6 +2932,13 @@ static int ntfs_fuse_removexattr(const char *path, const char *name)
res = -errno;
break;
case XATTR_NTFS_DOS_NAME:
ni = ntfs_check_access_xattr(&security,path,attr,TRUE);
if (ni) {
if (ntfs_remove_ntfs_dos_name(path,ni))
res = -errno;
} else
res = -errno;
break;
default :
/*
* make sure applications do not see