diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /fs/vfat/namei.c | |
parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'fs/vfat/namei.c')
-rw-r--r-- | fs/vfat/namei.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c index 0ac6d5314..1f4829709 100644 --- a/fs/vfat/namei.c +++ b/fs/vfat/namei.c @@ -618,12 +618,11 @@ static int vfat_create_shortname(struct inode *dir, struct nls_table *nls, sz = len; ext_start = NULL; } - break; + goto stop0; } } - if (charbuf[chi] == '.') - break; } +stop0:; if (ext_start == name - 1) { sz = len; ext_start = NULL; @@ -640,10 +639,12 @@ static int vfat_create_shortname(struct inode *dir, struct nls_table *nls, if (chl == 0) break; for (chi = 0; chi < chl; chi++) - if (!strchr(skip_chars, charbuf[chi])) - break; + if (!strchr(skip_chars, charbuf[chi])) { + goto stop1; + } name_start++; } +stop1:; if (name_start != ext_start) { sz = ext_start - name; ext_start++; |