Changeset 31018

Timestamp:

Apr 17, 2008, 12:55:07 AM (16 years ago)

Author:

neteler

Message:

Move recursive_copy() into libgis (G_recursive_copy()) to prevent LFS issues [bug #50] (backport from head, c30997 and c31002)

Location:

grass/branches/releasebranch_6_3

Files:

• general/manage/lib/Makefile (modified) (1 diff)
• general/manage/lib/copyfile.c (deleted)
• general/manage/lib/do_copy.c (modified) (5 diffs)
• include/gisdefs.h (modified) (1 diff)
• lib/gis/copy_dir.c (added)

grass/branches/releasebranch_6_3/general/manage/lib/Makefile

@@ -4 +4 @@
 
 LIB_NAME = $(MANAGE_LIBNAME)
-
-LIB_OBJS = add_elem.o ask.o copyfile.o do_copy.o do_list.o do_remove.o \
-           do_rename.o empty.o find.o get_len.o menu.o read_list.o \
-           show_elem.o sighold.o
 
 LOCAL_HEADERS = $(wildcard *.h) ../list.h

grass/branches/releasebranch_6_3/general/manage/lib/do_copy.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <string.h>
-#include <fcntl.h>
 #include <unistd.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include "list.h"
-
-static int recursive_copy(const char *src, const char *dst);
 
 /*
@@ -19 +13 @@
 {
     int i, ret, len;
-    char path[1024], path2[1024];
+    char path[GPATH_MAX], path2[GPATH_MAX];
     int result = 0;
 
@@ -51 +45 @@
             }
             G__file_name (path2, list[n].element[i], new, G_mapset());
-            if ( recursive_copy(path, path2) == 1 ) 
+            if ( G_recursive_copy(path, path2) == 1 ) 
             {
                 result = 1;
@@ -66 +60 @@
     if (G_strcasecmp (list[n].element[0], "cell") == 0)
     {
-        char colr2[50];
+        char colr2[GNAME_MAX];
 
         sprintf (colr2, "colr2/%s", G_mapset());
@@ -76 +70 @@
 }
 
-/* RULE:
- * 1. If destination does not exist, copy source to destination as expected.
- * 2. If destination already exists and it's a file, destination will be
- *    deleted first and apply RULE 1.
- * 3. If destination already exists which is a directory and source is a file,
- *    try to copy source to destination directory.
- * 4. If destination already exists which is a directory and source is also a
- *    directory, try to copy all contents in source to destination directory.
- *
- * This rule is designed according to general/manage/lib/copy.sh.
- *
- * POSSIBLE CASES:
- * if src is a file:
- *      if dst does not exist:
- *              copy src to dst                         RULE 1
- *      if dst is a file:
- *              delete dst and copy src to dst          RULE 2
- *      if dst is a directory:
- *              try recursive_copy(src, dst/src)        RULE 3
- * if src is a directory:
- *      if dst does not exist:
- *              copy src to dst                         RULE 1
- *      if dst is a file:
- *              delete dst and copy src to dst          RULE 2
- *      if dst is a directory:
- *              try                                     RULE 4
- *              for i in `ls src`
- *              do
- *                      recursive_copy(src/$i, dst/$i)
- *              done
- *
- * RETURN: 0 if successful, otherwise 1
- */
-static int
-recursive_copy(const char *src, const char *dst)
-{
-        DIR *dirp;
-        struct dirent *dp;
-        struct stat sb;
-        char buf[1024], buf2[1024];
-        int fd, fd2;
-        size_t len, len2;
-        mode_t mode;
-
-        if(G_lstat(src, &sb))
-                return 1;
-
-        /* src is a file */
-        if(!S_ISDIR((mode = sb.st_mode)))
-        {
-                if(!G_lstat(dst, &sb) && S_ISDIR(sb.st_mode))
-                {
-                        const char *p = strrchr(src, '/');
-                        /* src => dst/src */
-                        sprintf(buf, "%s/%s", dst, (p?p+1:src));
-
-                        return recursive_copy(src, buf);
-                }
-
-                /* src => dst */
-                if((fd = open(src, O_RDONLY)) < 0)
-                        return 1;
-
-                if((fd2 = open(dst, O_CREAT|O_TRUNC|O_WRONLY, mode & 0777)) < 0)
-                {
-                        close(fd);
-                        return 1;
-                }
-                while((len = read(fd, buf, 1024)) > 0)
-                {
-                        while(len && (len2 = write(fd2, buf, len)) >= 0)
-                                len -= len2;
-                }
-                close(fd);
-                close(fd2);
-
-                return 0;
-        }
-
-        /* src is a directory */
-
-        if(G_lstat(dst, &sb))
-        {
-                if(G_mkdir(dst))
-                        return 1;
-        }else
-        /* if dst already exists and it's a file, try to remove it */
-        if(!S_ISDIR(sb.st_mode))
-        {
-                if(remove(dst) || G_mkdir(dst))
-                        return 1;
-        }
-
-        if((dirp = opendir(src)) == NULL)
-                return 1;
-        while((dp = readdir(dirp)) != NULL)
-        {
-                /* do not copy hidden files */
-                if(dp->d_name[0] == '.')
-                        continue;
-                sprintf(buf, "%s/%s", src, dp->d_name);
-                sprintf(buf2, "%s/%s", dst, dp->d_name);
-                if(recursive_copy(buf, buf2))
-                        return 1;
-        }
-        closedir(dirp);
-
-        return 0;
-}

grass/branches/releasebranch_6_3/include/gisdefs.h

@@ -373 +373 @@
 
 /* copy_file.c */
-int G_copy_file(const char *infile, const char *outfile);
+int G_copy_file(const char *, const char *);
+int G_recursive_copy(const char *, const char *);
 
 /* dalloc.c */