CVS commit: othersrc/bin/fsu_ecp

[Antti Kantee]

Module Name:    othersrc
Committed By:   pooka
Date:           Fri Mar 27 10:33:53 UTC 2009

Modified Files:
        othersrc/bin/fsu_ecp: fsu_ecp.c

Log Message:
Don't treat destination chown as a fatal failure.  It will always
fail on e.g. msdosfs.  Mimics normal cp -Rp behaviour.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_ecp/fsu_ecp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: othersrc/bin/fsu_ecp/fsu_ecp.c
diff -u othersrc/bin/fsu_ecp/fsu_ecp.c:1.1 othersrc/bin/fsu_ecp/fsu_ecp.c:1.2
--- othersrc/bin/fsu_ecp/fsu_ecp.c:1.1	Mon Mar 23 21:03:57 2009
+++ othersrc/bin/fsu_ecp/fsu_ecp.c	Fri Mar 27 10:33:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_ecp.c,v 1.1 2009/03/23 21:03:57 stacktic Exp $ */
+/* $NetBSD: fsu_ecp.c,v 1.2 2009/03/27 10:33:53 pooka Exp $ */
 
 /*
  * Copyright (c) 2008 Arnaud Ysmal.  All Rights Reserved.
@@ -281,8 +281,7 @@
 	if (!(flags & FSU_ECP_GET)) {
 		rv = ukfs_chown(fs, to_p, root->sb.st_uid, root->sb.st_gid);
 		if (rv == -1) {
-			warn("%s", from_p);
-			goto out;
+			warn("chown %s", to_p);
 		}
 	}
 
@@ -316,9 +315,7 @@
 				rv = ukfs_chown(fs, to_p, cur->sb.st_uid,
 						cur->sb.st_gid);
 				if (rv == -1) {
-					warn("%s", to_p);
-					res = -1;
-					break;
+					warn("chown %s", to_p);
 				}
 			}
 		} else {
@@ -397,8 +394,7 @@
 	else
 		rv = ukfs_chown(fs, to, frstat->st_uid, frstat->st_gid);
 	if (rv == -1) {
-		warn("%s", to);
-		return -1;
+		warn("chown %s", to);
 	}
 
 	return 0;