aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/ext2fs/namei.c
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs/ext2fs/namei.c')
-rw-r--r--e2fsprogs/ext2fs/namei.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/e2fsprogs/ext2fs/namei.c b/e2fsprogs/ext2fs/namei.c
index 13d13adfe..6ce4bb363 100644
--- a/e2fsprogs/ext2fs/namei.c
+++ b/e2fsprogs/ext2fs/namei.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * namei.c --- ext2fs directory lookup operations 2 * namei.c --- ext2fs directory lookup operations
3 * 3 *
4 * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o. 4 * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o.
5 * 5 *
6 * %Begin-Header% 6 * %Begin-Header%
@@ -36,7 +36,7 @@ static errcode_t follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
36#ifdef NAMEI_DEBUG 36#ifdef NAMEI_DEBUG
37 printf("follow_link: root=%lu, dir=%lu, inode=%lu, lc=%d\n", 37 printf("follow_link: root=%lu, dir=%lu, inode=%lu, lc=%d\n",
38 root, dir, inode, link_count); 38 root, dir, inode, link_count);
39 39
40#endif 40#endif
41 retval = ext2fs_read_inode (fs, inode, &ei); 41 retval = ext2fs_read_inode (fs, inode, &ei);
42 if (retval) return retval; 42 if (retval) return retval;
@@ -85,12 +85,12 @@ static errcode_t dir_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
85 errcode_t retval; 85 errcode_t retval;
86 86
87 if ((c = *pathname) == '/') { 87 if ((c = *pathname) == '/') {
88 dir = root; 88 dir = root;
89 pathname++; 89 pathname++;
90 pathlen--; 90 pathlen--;
91 } 91 }
92 while (1) { 92 while (1) {
93 thisname = pathname; 93 thisname = pathname;
94 for (len=0; --pathlen >= 0;len++) { 94 for (len=0; --pathlen >= 0;len++) {
95 c = *(pathname++); 95 c = *(pathname++);
96 if (c == '/') 96 if (c == '/')
@@ -100,10 +100,10 @@ static errcode_t dir_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
100 break; 100 break;
101 retval = ext2fs_lookup (fs, dir, thisname, len, buf, &inode); 101 retval = ext2fs_lookup (fs, dir, thisname, len, buf, &inode);
102 if (retval) return retval; 102 if (retval) return retval;
103 retval = follow_link (fs, root, dir, inode, 103 retval = follow_link (fs, root, dir, inode,
104 link_count, buf, &dir); 104 link_count, buf, &dir);
105 if (retval) return retval; 105 if (retval) return retval;
106 } 106 }
107 *name = thisname; 107 *name = thisname;
108 *namelen = len; 108 *namelen = len;
109 *res_inode = dir; 109 *res_inode = dir;
@@ -152,13 +152,13 @@ errcode_t ext2fs_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
152{ 152{
153 char *buf; 153 char *buf;
154 errcode_t retval; 154 errcode_t retval;
155 155
156 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); 156 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
157 157
158 retval = ext2fs_get_mem(fs->blocksize, &buf); 158 retval = ext2fs_get_mem(fs->blocksize, &buf);
159 if (retval) 159 if (retval)
160 return retval; 160 return retval;
161 161
162 retval = open_namei(fs, root, cwd, name, strlen(name), 0, 0, 162 retval = open_namei(fs, root, cwd, name, strlen(name), 0, 0,
163 buf, inode); 163 buf, inode);
164 164
@@ -171,13 +171,13 @@ errcode_t ext2fs_namei_follow(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
171{ 171{
172 char *buf; 172 char *buf;
173 errcode_t retval; 173 errcode_t retval;
174 174
175 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); 175 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
176 176
177 retval = ext2fs_get_mem(fs->blocksize, &buf); 177 retval = ext2fs_get_mem(fs->blocksize, &buf);
178 if (retval) 178 if (retval)
179 return retval; 179 return retval;
180 180
181 retval = open_namei(fs, root, cwd, name, strlen(name), 1, 0, 181 retval = open_namei(fs, root, cwd, name, strlen(name), 1, 0,
182 buf, inode); 182 buf, inode);
183 183
@@ -190,7 +190,7 @@ errcode_t ext2fs_follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
190{ 190{
191 char *buf; 191 char *buf;
192 errcode_t retval; 192 errcode_t retval;
193 193
194 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); 194 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
195 195
196 retval = ext2fs_get_mem(fs->blocksize, &buf); 196 retval = ext2fs_get_mem(fs->blocksize, &buf);