diff options
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/hurd.texi | 8 | ||||
| -rw-r--r-- | fstests/ChangeLog | 5 | ||||
| -rw-r--r-- | fstests/fstests.c | 8 | ||||
| -rw-r--r-- | hurd/ChangeLog | 7 | ||||
| -rw-r--r-- | hurd/fs.defs | 6 | ||||
| -rw-r--r-- | hurd/fsys.defs | 6 | ||||
| -rw-r--r-- | hurd/hurd_types.h | 2 | ||||
| -rw-r--r-- | libdiskfs/ChangeLog | 6 | ||||
| -rw-r--r-- | libdiskfs/diskfs.h | 8 | ||||
| -rw-r--r-- | libdiskfs/fsys-getroot.c | 4 | ||||
| -rw-r--r-- | libfshelp/ChangeLog | 5 | ||||
| -rw-r--r-- | libfshelp/fshelp.h | 12 |
13 files changed, 55 insertions, 27 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index e0f6405c..3e0c625e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2002-03-05 Marcus Brinkmann <marcus@gnu.org> + + * hurd.texi (Diskfs Callbacks): Refer to dir_lookup, not dir_pathtrans. + Reported by James A Morrison <ja2morri@student.math.uwaterloo.ca>. + 2001-01-08 Marcus Brinkmann <marcus@gnu.org> * hurd.texi (Store Management): Replace off_t with store_offset_t. diff --git a/doc/hurd.texi b/doc/hurd.texi index ec025691..4e8243a3 100644 --- a/doc/hurd.texi +++ b/doc/hurd.texi @@ -98,7 +98,7 @@ @end direntry @ifinfo -Copyright @copyright{} 1994-2000 Free Software Foundation, Inc. +Copyright @copyright{} 1994-2002 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -131,7 +131,7 @@ into another language, under the above conditions for modified versions. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1994--2000 Free Software Foundation, Inc. +Copyright @copyright{} 1994--2002 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -2516,7 +2516,7 @@ call to @code{fshelp_fetch_root}. Fetch the root from @var{transbox}. @var{dotdot} is an unauthenticated port for the directory in which we are looking; @var{user} specifies the ids of the user responsible for the call. @var{flags} are as for -@code{dir_pathtrans} (but @code{O_CREAT} and @code{O_EXCL} are not +@code{dir_lookup} (but @code{O_CREAT} and @code{O_EXCL} are not meaningful and are ignored). The transbox lock (as set by @code{fshelp_transbox_init}) must be held before the call, and will be held upon return, but may be released during the operation of the call. @@ -3956,7 +3956,7 @@ need to reimplement @code{dir_rename} yourself. @deftypevar int diskfs_maxsymlinks This variable is a positive integer which is the maximum number of symbolic links which can be traversed within a single call to -@code{dir_pathtrans}. If this is exceeded, @code{dir_pathtrans} will +@code{dir_lookup}. If this is exceeded, @code{dir_lookup} will return @code{ELOOP}. @end deftypevar diff --git a/fstests/ChangeLog b/fstests/ChangeLog index 6849e0a1..0ed8e3f4 100644 --- a/fstests/ChangeLog +++ b/fstests/ChangeLog @@ -1,3 +1,8 @@ +2002-03-05 Marcus Brinkmann <marcus@gnu.org> + + * fstests.c (main): Call dir_lookup, not dir_pathtrans. + Reported by James A Morrison <ja2morri@student.math.uwaterloo.ca>. + 2001-02-25 Roland McGrath <roland@frob.com> * fstests.c (main): sync now returns void. diff --git a/fstests/fstests.c b/fstests/fstests.c index 7611bce1..5e72f0b0 100644 --- a/fstests/fstests.c +++ b/fstests/fstests.c @@ -1,5 +1,5 @@ /* Test filesystem behavior - Copyright (C) 1993,94,2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1993,94,2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU Hurd. @@ -59,9 +59,9 @@ main () #if 0 if ((err = dir_unlink (root, "CREATED")) && err != ENOENT) printf ("Error on unlink: %d\n", err); - else if (err = dir_pathtrans (root, "CREATED", O_WRITE | O_CREAT, 0666, - &retry, pathbuf, &filetowrite)) - printf ("Error on pathtrans: %d\n", err); + else if (err = dir_lookup (root, "CREATED", O_WRITE | O_CREAT, 0666, + &retry, pathbuf, &filetowrite)) + printf ("Error on lookup: %d\n", err); else if (err = io_write (filetowrite, string, strlen (string), -1, &written)) printf ("Error on write: %d\n", err); else if (written != strlen (string)) diff --git a/hurd/ChangeLog b/hurd/ChangeLog index 1fedd0c2..e3f744b9 100644 --- a/hurd/ChangeLog +++ b/hurd/ChangeLog @@ -1,3 +1,10 @@ +2002-03-05 Marcus Brinkmann <marcus@gnu.org> + + * fs.defs: Refer to dir_lookup, not dir_pathtrans, in comments. + * fsys.defs: Likewise. + * hurd_types.h (enum retry_type): Likewise. + Reported by James A Morrison <ja2morri@student.math.uwaterloo.ca>. + 2002-01-01 Roland McGrath <roland@frob.com> * exec.defs (exec_exec, exec_setexecdata): Use SCP macro diff --git a/hurd/fs.defs b/hurd/fs.defs index c3bd618e..eed5f8ab 100644 --- a/hurd/fs.defs +++ b/hurd/fs.defs @@ -1,5 +1,5 @@ /* Definitions for the filesystem interface. - Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc. + Copyright (C) 1994,95,96,97,98,99, 2002 Free Software Foundation, Inc. This file is part of the GNU Hurd. @@ -284,7 +284,7 @@ routine dir_rename ( /* Create a new file without linking it into the filesystem. You still must have write permission on the specified directory, even though it will not actually be written. Return in *newnode a port - to the file. Flags are the same as for dir_pathtrans, but + to the file. Flags are the same as for dir_lookup, but O_CREAT and O_TRUNC are assumed even if not specified. */ routine dir_mkfile ( directory: file_t; @@ -303,7 +303,7 @@ routine dir_notice_changes ( /* To get or set the translator currently running on a file, use file_set_translator, file_get_translator, or file_get_translator_cntl on a port gotten with the - FS_LOOKUP_NOTRANS flag to dir_pathtrans. You can send these RPCs + FS_LOOKUP_NOTRANS flag to dir_lookup. You can send these RPCs to a port to a translated node (looked up without FS_LOOKUP_NOTRANS) to stack a new translator on top of the existing one. */ diff --git a/hurd/fsys.defs b/hurd/fsys.defs index 353db249..979a6cfc 100644 --- a/hurd/fsys.defs +++ b/hurd/fsys.defs @@ -1,5 +1,5 @@ /* Definitions for the filesystem control interface - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation + Copyright (C) 1992,93,94,95,96,97, 2002 Free Software Foundation This file is part of the GNU Hurd. @@ -51,9 +51,9 @@ routine fsys_goaway ( flags: int); /* Return a file to the root of the filesystem. - FLAGS are as for dir_pathtrans (but O_CREAT and O_EXCL are not + FLAGS are as for dir_lookup (but O_CREAT and O_EXCL are not meaningful). DO_RETRY, RETRY_NAME, and RESULT are as - for dir_pathtrans. The port should be authenticated with GEN_UIDS + for dir_lookup. The port should be authenticated with GEN_UIDS and GEN_GIDS (except, of course, for FS_RETRY_REAUTH and FS_RETRY_MAGICAL). DOTDOT_NODE is an unauthenticated port for the directory in which this root is located. */ diff --git a/hurd/hurd_types.h b/hurd/hurd_types.h index cef0cecc..6fb4e627 100644 --- a/hurd/hurd_types.h +++ b/hurd/hurd_types.h @@ -83,7 +83,7 @@ typedef struct statfs fsys_statfsbuf_t; #define FS_TRANS_SET 0x00000004 /* Set or clear translator */ #define FS_TRANS_ORPHAN 0x00000008 /* Orphan the active translator. */ -/* Values for retry field in fs.defs:dir_pathtrans call: */ +/* Values for retry field in fs.defs:dir_lookup call: */ enum retry_type { FS_RETRY_NORMAL = 1, /* Retry normally if retry_name is not null. */ diff --git a/libdiskfs/ChangeLog b/libdiskfs/ChangeLog index d09ad920..1c5ace96 100644 --- a/libdiskfs/ChangeLog +++ b/libdiskfs/ChangeLog @@ -1,3 +1,9 @@ +2002-03-05 Marcus Brinkmann <marcus@gnu.org> + + * diskfs.h: Refer to dir_lookup, not dir_pathtrans, in comment. + * fsys-getroot.c (diskfs_S_fsys_getroot): Likewise. + Reported by James A Morrison <ja2morri@student.math.uwaterloo.ca>. + 2002-01-03 Roland McGrath <roland@frob.com> * dir-lookup.c (diskfs_S_dir_lookup): Clear S_ITRANS bits in MODE. diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h index d32484da..f7838876 100644 --- a/libdiskfs/diskfs.h +++ b/libdiskfs/diskfs.h @@ -1,5 +1,5 @@ /* Definitions for fileserver helper functions - Copyright (C) 1994,95,96,97,98,99,2001 Free Software Foundation, Inc. + Copyright (C) 1994,95,96,97,98,99,2001, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -47,7 +47,7 @@ struct protid struct shared_io *mapped; }; -/* One of these is created for each node opened by dir_pathtrans. */ +/* One of these is created for each node opened by dir_lookup. */ struct peropen { int filepointer; @@ -220,8 +220,8 @@ extern int diskfs_link_max; extern int diskfs_name_max; /* The user must define this variable; it is the maximum number of - symlinks to be traversed within a single call to dir_pathtrans. - If this is exceeded, dir_pathtrans will return ELOOP. */ + symlinks to be traversed within a single call to dir_lookup. + If this is exceeded, dir_lookup will return ELOOP. */ extern int diskfs_maxsymlinks; /* This variable is defined by diskfs; the user should set it if diff --git a/libdiskfs/fsys-getroot.c b/libdiskfs/fsys-getroot.c index 4e44395d..08eca284 100644 --- a/libdiskfs/fsys-getroot.c +++ b/libdiskfs/fsys-getroot.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998 Free Software Foundation + Copyright (C) 1993,94,95,96,97,98, 2002 Free Software Foundation This file is part of the GNU Hurd. @@ -68,7 +68,7 @@ diskfs_S_fsys_getroot (fsys_t controlport, mutex_lock (&diskfs_root_node->lock); /* This code is similar (but not the same as) the code in - dir-pathtrans.c that does the same thing. Perhaps a way should + dir-lookup.c that does the same thing. Perhaps a way should be found to share the logic. */ type = diskfs_root_node->dn_stat.st_mode & S_IFMT; diff --git a/libfshelp/ChangeLog b/libfshelp/ChangeLog index b715c720..38cd25c3 100644 --- a/libfshelp/ChangeLog +++ b/libfshelp/ChangeLog @@ -1,3 +1,8 @@ +2002-03-05 Marcus Brinkmann <marcus@gnu.org> + + * fshelp.h: Refer to dir_lookup, not dir_pathtrans, in comment. + Reported by James A Morrison <ja2morri@student.math.uwaterloo.ca>. + 2002-01-02 Roland McGrath <roland@frob.com> * start-translator-long.c (fshelp_start_translator_long) diff --git a/libfshelp/fshelp.h b/libfshelp/fshelp.h index 88f63b69..8b395dd9 100644 --- a/libfshelp/fshelp.h +++ b/libfshelp/fshelp.h @@ -1,5 +1,5 @@ /* FS helper library definitions - Copyright (C) 1994,95,96,97,98,99,2000,01 Free Software Foundation, Inc. + Copyright (C) 1994,95,96,97,98,99,2000,01,02 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -121,11 +121,11 @@ typedef error_t (*fshelp_fetch_root_callback2_t) (void *cookie1, void *cookie2, /* Fetch the root from TRANSBOX. DOTDOT is an unauthenticated port for the directory in which we are looking; USER specifies the ids - of the user responsible for the call. FLAGS are as for - dir_pathtrans (but O_CREAT and O_EXCL are not meaningful and are - ignored). The trasnbox lock (as set by fshelp_transbox_init) must - be held before the call, and will be held upon return, but may be - released during the operation of the call. */ + of the user responsible for the call. FLAGS are as for dir_lookup + (but O_CREAT and O_EXCL are not meaningful and are ignored). The + transbox lock (as set by fshelp_transbox_init) must be held before + the call, and will be held upon return, but may be released during + the operation of the call. */ error_t fshelp_fetch_root (struct transbox *transbox, void *cookie, file_t dotdot, |