diff options
Diffstat (limited to 'gnu/libexec/uucp/libunix/move.c')
| -rw-r--r-- | gnu/libexec/uucp/libunix/move.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/gnu/libexec/uucp/libunix/move.c b/gnu/libexec/uucp/libunix/move.c index ccfe6d4d728d..3345bbfa04dc 100644 --- a/gnu/libexec/uucp/libunix/move.c +++ b/gnu/libexec/uucp/libunix/move.c @@ -1,7 +1,7 @@ /* move.c Move a file. - Copyright (C) 1991, 1992 Ian Lance Taylor + Copyright (C) 1991, 1992, 1993 Ian Lance Taylor This file is part of the Taylor UUCP package. @@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. The author of the program may be contacted at ian@airs.com or - c/o Infinity Development Systems, P.O. Box 520, Waltham, MA 02254. + c/o Cygnus Support, Building 200, 1 Kendall Square, Cambridge, MA 02139. */ #include "uucp.h" @@ -77,14 +77,12 @@ fsysdep_move_file (zorig, zto, fmkdirs, fpublic, fcheck, zuser) if (stat (zcopy, &s) != 0) { ulog (LOG_ERROR, "stat (%s): %s", zcopy, strerror (errno)); - (void) remove (zorig); ubuffree (zcopy); return FALSE; } if (! fsuser_access (&s, W_OK, zuser)) { ulog (LOG_ERROR, "%s: %s", zcopy, strerror (EACCES)); - (void) remove (zorig); ubuffree (zcopy); return FALSE; } @@ -107,10 +105,7 @@ fsysdep_move_file (zorig, zto, fmkdirs, fpublic, fcheck, zuser) if (fmkdirs && errno == ENOENT) { if (! fsysdep_make_dirs (zto, fpublic)) - { - (void) remove (zorig); - return FALSE; - } + return FALSE; if (rename (zorig, zto) == 0) return TRUE; } @@ -127,7 +122,6 @@ fsysdep_move_file (zorig, zto, fmkdirs, fpublic, fcheck, zuser) { ulog (LOG_ERROR, "rename (%s, %s): %s", zorig, zto, strerror (errno)); - (void) remove (zorig); return FALSE; } @@ -135,7 +129,6 @@ fsysdep_move_file (zorig, zto, fmkdirs, fpublic, fcheck, zuser) if (stat ((char *) zorig, &s) < 0) { ulog (LOG_ERROR, "stat (%s): %s", zorig, strerror (errno)); - (void) remove (zorig); return FALSE; } @@ -148,26 +141,19 @@ fsysdep_move_file (zorig, zto, fmkdirs, fpublic, fcheck, zuser) if (fmkdirs && errno == ENOENT) { if (! fsysdep_make_dirs (zto, fpublic)) - { - (void) remove (zorig); - return FALSE; - } + return FALSE; o = creat ((char *) zto, s.st_mode); } if (o < 0) { ulog (LOG_ERROR, "creat (%s): %s", zto, strerror (errno)); - (void) remove (zorig); return FALSE; } } (void) close (o); if (! fcopy_file (zorig, zto, fpublic, fmkdirs)) - { - (void) remove (zorig); - return FALSE; - } + return FALSE; if (remove (zorig) != 0) ulog (LOG_ERROR, "remove (%s): %s", zorig, strerror (errno)); |