oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include/limits.h: merged

Browse Source 
Replacing SYMLOOP_MAX, SYMLINK_MAX, by _POSIX_SYMLOOP_MAX,
_POSIX_SYMLINK_MAX respectively.

Change-Id: I020c20b0dbf6d44e777879d786a20811f23d1561
This commit is contained in:
Lionel Sambuc 2013-12-03 13:55:11 +01:00
parent 57476292b0
commit 3053b27247
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/limits.h
View File

@ -171,11 +171,6 @@
# define CHAR_MAX SCHAR_MAX # define CHAR_MAX SCHAR_MAX
#endif #endif
#ifdef __minix
#define SYMLOOP_MAX 16
#define SYMLINK_MAX 1024
#endif /* __minix */
#include <sys/syslimits.h> #include <sys/syslimits.h>
#endif /* !_LIMITS_H_ */ #endif /* !_LIMITS_H_ */

2
lib/libpuffs/path.c
View File

@ -258,7 +258,7 @@ int *symlinkp
*offsetp = 0; *offsetp = 0;
/* Symloop limit reached? */ /* Symloop limit reached? */
if (++(*symlinkp) > SYMLOOP_MAX) if (++(*symlinkp) > _POSIX_SYMLOOP_MAX)
r = ELOOP; r = ELOOP;
if (r != OK) if (r != OK)

2
lib/libvtreefs/path.c
View File

@ -230,7 +230,7 @@ int fs_lookup(void)
(ptr[0] != '\0' || (ptr[0] != '\0' ||
!(fs_m_in.REQ_FLAGS & PATH_RET_SYMLINK))) { !(fs_m_in.REQ_FLAGS & PATH_RET_SYMLINK))) {
if (++symloop == SYMLOOP_MAX) { if (++symloop == _POSIX_SYMLOOP_MAX) {
put_inode(next_ino); put_inode(next_ino);
r = ELOOP; r = ELOOP;

2
servers/ext2/path.c
View File

@ -251,7 +251,7 @@ int *symlinkp;
*offsetp = 0; *offsetp = 0;
/* Symloop limit reached? */ /* Symloop limit reached? */
if (++(*symlinkp) > SYMLOOP_MAX) if (++(*symlinkp) > _POSIX_SYMLOOP_MAX)
r = ELOOP; r = ELOOP;
if (r != OK) { if (r != OK) {

2
servers/mfs/path.c
View File

@ -246,7 +246,7 @@ int *symlinkp
*offsetp = 0; *offsetp = 0;
/* Symloop limit reached? */ /* Symloop limit reached? */
if (++(*symlinkp) > SYMLOOP_MAX) if (++(*symlinkp) > _POSIX_SYMLOOP_MAX)
r = ELOOP; r = ELOOP;
if (r != OK) { if (r != OK) {

2
servers/vfs/link.c
View File

@ -409,7 +409,7 @@ int do_slink(void)
vname2_length = job_m_in.VFS_LINK_LEN2; vname2_length = job_m_in.VFS_LINK_LEN2;
if (vname1_length <= 1) return(ENOENT); if (vname1_length <= 1) return(ENOENT);
if (vname1_length >= SYMLINK_MAX) return(ENAMETOOLONG); if (vname1_length >= _POSIX_SYMLINK_MAX) return(ENAMETOOLONG);
/* Get dir inode of 'name2' */ /* Get dir inode of 'name2' */
if (fetch_name(vname2, vname2_length, fullpath) != OK) return(err_code); if (fetch_name(vname2, vname2_length, fullpath) != OK) return(err_code);

10
servers/vfs/path.c
View File

@ -353,9 +353,9 @@ struct fproc *rfp;
} }
} }
break; break;
} while (symloop < SYMLOOP_MAX); } while (symloop < _POSIX_SYMLOOP_MAX);
if (symloop >= SYMLOOP_MAX) { if (symloop >= _POSIX_SYMLOOP_MAX) {
err_code = ELOOP; err_code = ELOOP;
res_vp = NULL; res_vp = NULL;
} }
@ -475,7 +475,7 @@ struct fproc *rfp;
/* Update the current value of the symloop counter */ /* Update the current value of the symloop counter */
symloop += res.symloop; symloop += res.symloop;
if (symloop > SYMLOOP_MAX) { if (symloop > _POSIX_SYMLOOP_MAX) {
if (vmpres) unlock_vmnt(vmpres); if (vmpres) unlock_vmnt(vmpres);
*(resolve->l_vmp) = NULL; *(resolve->l_vmp) = NULL;
return(ELOOP); return(ELOOP);
@ -708,9 +708,9 @@ struct fproc *rfp;
/* encountered a symlink -- loop again */ /* encountered a symlink -- loop again */
strlcpy(orig_path, temp_path, PATH_MAX); strlcpy(orig_path, temp_path, PATH_MAX);
symloop++; symloop++;
} while (symloop < SYMLOOP_MAX); } while (symloop < _POSIX_SYMLOOP_MAX);
if (symloop >= SYMLOOP_MAX) { if (symloop >= _POSIX_SYMLOOP_MAX) {
if (dir_vp) { if (dir_vp) {
unlock_vnode(dir_vp); unlock_vnode(dir_vp);
unlock_vmnt(dir_vmp); unlock_vmnt(dir_vmp);