Mercurial > illumos > illumos-gate

changeset 12847:e5b18d290ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
4427472 cpio ACL routines need gettext
author Rich Burridge <rich.burridge@oracle.com>
date Thu, 15 Jul 2010 13:02:24 -0700
parents 80922850cf92
children 0d0733997434
files usr/src/cmd/cpio/cpio.c
diffstat 1 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/cpio/cpio.c	Thu Jul 15 12:37:49 2010 -0700
+++ b/usr/src/cmd/cpio/cpio.c	Thu Jul 15 13:02:24 2010 -0700
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -7895,12 +7894,10 @@
 	if (Hdr_type == BAR) {
 		if (is_tape(*fdes)) {
 			bufsize = BAR_TAPE_SIZE;
-			(void) fprintf(stderr, "Archiving to tape");
-			(void) fprintf(stderr, " blocking factor 126\n");
+			msg(EPOST, "Archiving to tape blocking factor 126");
 		} else if (is_floppy(*fdes)) {
 			bufsize = BAR_FLOPPY_SIZE;
-			(void) fprintf(stderr, "Archiving to floppy");
-			(void) fprintf(stderr, " blocking factor 18\n");
+			msg(EPOST, "Archiving to floppy blocking factor 18");
 		}
 	}
 
@@ -8043,14 +8040,14 @@
 		attrtext = acl_totext(aclp, ACL_APPEND_ID | ACL_COMPACT_FMT |
 		    ACL_SID_FMT);
 		if (attrtext == NULL) {
-			(void) fprintf(stderr, "acltotext failed\n");
+			msg(EPOST, "acltotext failed");
 			return (-1);
 		}
 		/* header: type + size = 8 */
 		newattrsize = 8 + strlen(attrtext) + 1;
 		attr = e_zalloc(E_NORMAL, newattrsize);
 		if (attr == NULL) {
-			(void) fprintf(stderr, "can't allocate memory\n");
+			msg(EPOST, "can't allocate memory");
 			return (-1);
 		}
 		attr->attr_type = (acl_type(aclp) == ACLENT_T) ?
@@ -8064,7 +8061,7 @@
 		/* SunFed's case goes here */
 
 	default:
-		(void) fprintf(stderr, "unrecognized attribute type\n");
+		msg(EPOST, "unrecognized attribute type");
 		return (-1);
 	}
 
@@ -8073,7 +8070,7 @@
 	*secinfo_len += newattrsize;
 	new_secinfo = e_zalloc(E_NORMAL, (uint_t)*secinfo_len);
 	if (new_secinfo == NULL) {
-		(void) fprintf(stderr, "can't allocate memory\n");
+		msg(EPOST, "can't allocate memory");
 		*secinfo_len -= newattrsize;
 		return (-1);
 	}