Sort sections.

[pw-darwin.git] / pw / cpdir.c

diff --git a/pw/cpdir.c b/pw/cpdir.c
index f8e2c324df6cac946a2b917e621a5ec08384f5ba..d8fa42bab61fcf48fe510807e3fd66bf4552de0d 100644 (file)
--- a/pw/cpdir.c
+++ b/pw/cpdir.c
@@ -22,20 +22,24 @@
  * 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.
- *
- *     $FreeBSD$
  */
 
+#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 "pwupd.h"
 
@@ -47,8 +51,7 @@ copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid
        char            dst[MAXPATHLEN];
 
        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;
@@ -69,18 +72,23 @@ 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 (stat(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);
+                                                               chflags(dst, st.st_flags);      /* propogate flags */
                                                        /*
-                                                        * Note: don't propogate 'special' attributes
+                                                        * Note: don't propogate special attributes
+                                                        * but do propogate 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);
@@ -95,9 +103,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);
+                                                               /*
+                                                                * Propogate special filesystem flags
+                                                                */
+                                                               fchown(outfd, uid, gid);
+                                                               fchflags(outfd, st.st_flags);
                                                                close(outfd);
                                                                chown(dst, uid, gid);
                                                        }
+                                                   }
                                                }
                                        }
                                }