leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] fat: kill reserved names

Browse Source 
Since these names on old MSDOS is used as device, so, current fat driver
doesn't allow a user to create those names.  But many OSes and even Windows
can create those names actually, now.

This patch removes the reserved name check.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
OGAWA Hirofumi 2006-03-31 02:30:53 -08:00 committed by Linus Torvalds
parent e4e364e865
commit 094e320d76
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/msdos/namei.c
View File

@ -12,14 +12,6 @@
#include <linux/msdos_fs.h> #include <linux/msdos_fs.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
/* MS-DOS "device special files" */
static const unsigned char *reserved_names[] = {
"CON ", "PRN ", "NUL ", "AUX ",
"LPT1 ", "LPT2 ", "LPT3 ", "LPT4 ",
"COM1 ", "COM2 ", "COM3 ", "COM4 ",
NULL
};
/* Characters that are undesirable in an MS-DOS file name */ /* Characters that are undesirable in an MS-DOS file name */
static unsigned char bad_chars[] = "*?<>|\""; static unsigned char bad_chars[] = "*?<>|\"";
static unsigned char bad_if_strict_pc[] = "+=,; "; static unsigned char bad_if_strict_pc[] = "+=,; ";
@ -40,7 +32,6 @@ static int msdos_format_name(const unsigned char *name, int len,
*/ */
{ {
unsigned char *walk; unsigned char *walk;
const unsigned char **reserved;
unsigned char c; unsigned char c;
int space; int space;
@ -127,11 +118,7 @@ static int msdos_format_name(const unsigned char *name, int len,
} }
while (walk - res < MSDOS_NAME) while (walk - res < MSDOS_NAME)
*walk++ = ' '; *walk++ = ' ';
if (!opts->atari)
/* GEMDOS is less stupid and has no reserved names */
for (reserved = reserved_names; *reserved; reserved++)
if (!strncmp(res, *reserved, 8))
return -EINVAL;
return 0; return 0;
} }

18
fs/vfat/namei.c
View File

@ -185,24 +185,6 @@ static int vfat_valid_longname(const unsigned char *name, unsigned int len)
return -EINVAL; return -EINVAL;
if (len >= 256) if (len >= 256)
return -ENAMETOOLONG; return -ENAMETOOLONG;
/* MS-DOS "device special files" */
if (len == 3 || (len > 3 && name[3] == '.')) { /* basename == 3 */
if (!strnicmp(name, "aux", 3) ||
!strnicmp(name, "con", 3) ||
!strnicmp(name, "nul", 3) ||
!strnicmp(name, "prn", 3))
return -EINVAL;
}
if (len == 4 || (len > 4 && name[4] == '.')) { /* basename == 4 */
/* "com1", "com2", ... */
if ('1' <= name[3] && name[3] <= '9') {
if (!strnicmp(name, "com", 3) ||
!strnicmp(name, "lpt", 3))
return -EINVAL;
}
}
return 0; return 0;
} }