diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-11-29 19:09:16 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-11-29 19:09:16 +0000 |
| commit | 86fe737e5c77e063b373d5d01c693c1fd1062a27 (patch) | |
| tree | c35eb41b3e4cf8ad39724e2185d22daa224186f2 /paxlib | |
| parent | 0e6f42e86bc904058928ea4bab27b17e25198a13 (diff) | |
| download | paxutils-86fe737e5c77e063b373d5d01c693c1fd1062a27.tar.gz | |
* lib/rtapelib.c (encode_oflag): Simplify code, since O_NONBLOCK
is always defined now.
* paxlib/rtape.c (encode_oflag): Likewise.
* lib/system.h (O_DIRCTORY, O_NOATIME, O_NONBLOCK): Define to 0
if not already defined.
* paxlib/error.c (rmdir_error): New function.
* paxlib/error.h (rmdir_error): New decl.
* rmt/rmt.c (decode_oflag): Use '#if O_NONBLOCK", not ifdef.
Diffstat (limited to 'paxlib')
| -rw-r--r-- | paxlib/error.c | 6 | ||||
| -rw-r--r-- | paxlib/paxlib.h | 1 | ||||
| -rw-r--r-- | paxlib/rtape.c | 17 |
3 files changed, 14 insertions, 10 deletions
diff --git a/paxlib/error.c b/paxlib/error.c index b2bf3d6..1fe2909 100644 --- a/paxlib/error.c +++ b/paxlib/error.c @@ -228,6 +228,12 @@ readlink_warn (char const *name) } void +rmdir_error (char const *name) +{ + call_arg_error ("rmdir", name); +} + +void savedir_error (char const *name) { call_arg_error ("savedir", name); diff --git a/paxlib/paxlib.h b/paxlib/paxlib.h index c9b3036..381c4c7 100644 --- a/paxlib/paxlib.h +++ b/paxlib/paxlib.h @@ -81,6 +81,7 @@ void read_fatal_details (char const *, off_t, size_t) __attribute__ ((noreturn)) void read_warn_details (char const *, off_t, size_t); void readlink_error (char const *); void readlink_warn (char const *); +void rmdir_error (char const *); void savedir_error (char const *); void savedir_warn (char const *); void seek_error (char const *); diff --git a/paxlib/rtape.c b/paxlib/rtape.c index 22307fe..90ac263 100644 --- a/paxlib/rtape.c +++ b/paxlib/rtape.c @@ -310,15 +310,15 @@ encode_oflag (char *buf, int oflag) case O_RDONLY: strcat (buf, "O_RDONLY"); break; - + case O_RDWR: strcat (buf, "O_RDWR"); break; - + case O_WRONLY: strcat (buf, "O_WRONLY"); break; - + default: abort (); } @@ -343,10 +343,8 @@ encode_oflag (char *buf, int oflag) if (oflag & O_NOCTTY) strcat (buf, "|O_NOCTTY"); #endif -#ifdef O_NONBLOCK if (oflag & O_NONBLOCK) strcat (buf, "|O_NONBLOCK"); -#endif #ifdef O_RSYNC if (oflag & O_RSYNC) strcat (buf, "|O_RSYNC"); @@ -508,7 +506,7 @@ rmt_open (const char *file_name, int open_mode, int bias, if (!rmt_command) rmt_command = DEFAULT_RMT_COMMAND; - + if (remote_user) execl (remote_shell, remote_shell_basename, remote_host, "-l", remote_user, rmt_command, (char *) 0); @@ -650,15 +648,15 @@ rmt_lseek (int handle, off_t offset, int whence) case SEEK_SET: whence = 0; break; - + case SEEK_CUR: whence = 1; break; - + case SEEK_END: whence = 2; break; - + default: abort (); } @@ -758,4 +756,3 @@ rmt_ioctl (int handle, int operation, char *argument) } } - |