X-Git-Url: https://git.cameronkatri.com/pw-darwin.git/blobdiff_plain/7b695de799ec47d008ed93b25da9266cfb6d6da1..f233ff62a96a2d0c369be8dcd504c169cbd60ffa:/pw/cpdir.c

diff --git a/pw/cpdir.c b/pw/cpdir.c
index c203c89..0fd671b 100644
--- a/pw/cpdir.c
+++ b/pw/cpdir.c
@@ -1,26 +1,20 @@
 /*-
- * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
- * All rights reserved.
+ * Copyright (C) 1996
+ *	David L. Nugent.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified.
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by David L. Nugent.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE DAVID L. NUGENT ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -28,33 +22,38 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <fcntl.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <dirent.h>
-#include <unistd.h>
 #include <sys/param.h>
-#include <errno.h>
+#include <dirent.h>
 
+#include "pw.h"
 #include "pwupd.h"
 
 void
 copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid)
 {
-	int             rc = 0;
 	char            src[MAXPATHLEN];
 	char            dst[MAXPATHLEN];
+	char            lnk[MAXPATHLEN];
+	int             len;
 
 	if (mkdir(dir, mode) != 0 && errno != EEXIST) {
-		sprintf(src, "mkdir(%s)", dir);
-		perror(src);
+		warn("mkdir(%s)", dir);
 	} else {
 		int             infd, outfd;
 		struct stat     st;
@@ -64,9 +63,7 @@ copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid
 
 		++counter;
 		chown(dir, uid, gid);
-		if (skel == NULL || *skel == '\0')
-			rc = 1;
-		else {
+		if (skel != NULL && *skel != '\0') {
 			DIR            *d = opendir(skel);
 
 			if (d != NULL) {
@@ -75,18 +72,27 @@ copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid
 				while ((e = readdir(d)) != NULL) {
 					char           *p = e->d_name;
 
-					sprintf(src, "%s/%s", skel, p);
-					if (stat(src, &st) == 0) {
+					if (snprintf(src, sizeof(src), "%s/%s", skel, p) >= (int)sizeof(src))
+						warn("warning: pathname too long '%s/%s' (skel not copied)", skel, p);
+					else if (lstat(src, &st) == 0) {
 						if (strncmp(p, "dot.", 4) == 0)	/* Conversion */
 							p += 3;
-						sprintf(dst, "%s/%s", dir, p);
-						if (S_ISDIR(st.st_mode)) {	/* Recurse for this */
+						if (snprintf(dst, sizeof(dst), "%s/%s", dir, p) >= (int)sizeof(dst))
+							warn("warning: path too long '%s/%s' (skel file skipped)", dir, p);
+						else {
+						    if (S_ISDIR(st.st_mode)) {	/* Recurse for this */
 							if (strcmp(e->d_name, ".") != 0 && strcmp(e->d_name, "..") != 0)
-								copymkdir(dst, src, (st.st_mode & 0777), uid, gid);
+								copymkdir(dst, src, st.st_mode & _DEF_DIRMODE, uid, gid);
+								chflags(dst, st.st_flags);	/* propagate flags */
+						    } else if (S_ISLNK(st.st_mode) && (len = readlink(src, lnk, sizeof(lnk) - 1)) != -1) {
+							lnk[len] = '\0';
+							symlink(lnk, dst);
+							lchown(dst, uid, gid);
 							/*
-							 * Note: don't propogate 'special' attributes
+							 * Note: don't propagate special attributes
+							 * but do propagate file flags
 							 */
-						} else if (S_ISREG(st.st_mode) && (outfd = open(dst, O_RDWR | O_CREAT | O_EXCL, st.st_mode)) != -1) {
+						    } else if (S_ISREG(st.st_mode) && (outfd = open(dst, O_RDWR | O_CREAT | O_EXCL, st.st_mode)) != -1) {
 							if ((infd = open(src, O_RDONLY)) == -1) {
 								close(outfd);
 								remove(dst);
@@ -101,9 +107,15 @@ copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid
 								while ((b = read(infd, copybuf, 4096)) > 0)
 									write(outfd, copybuf, b);
 								close(infd);
+								/*
+								 * Propagate special filesystem flags
+								 */
+								fchown(outfd, uid, gid);
+								fchflags(outfd, st.st_flags);
 								close(outfd);
 								chown(dst, uid, gid);
 							}
+						    }
 						}
 					}
 				}