commit 20abefa449374c10164146a07cfd5aa043021e0a
author Zesstra <zesstra@zesstra.de> Thu Aug 27 22:15:43 2020 +0200
committer Zesstra <zesstra@zesstra.de> Thu Aug 27 22:16:52 2020 +0200
tree 263db696bad5ce03af7820483745aeafcdb44def
parent 2451a7121a6d16461423229a890498ffb73fb4dc

sefun copy_file entfernt.

Seit der Driver eine gleichnamige hat, benutzen wir
jene.

Change-Id: Ie015899f02e2981900a3e4de6d1a61110a3fcb18

secure/simul_efun/files.c

diff --git a/secure/simul_efun/files.c b/secure/simul_efun/files.c
index e967367..818f2f4 100644
--- a/secure/simul_efun/files.c
+++ b/secure/simul_efun/files.c
@@ -84,49 +84,5 @@
     return(write_file(file,txt));
 }
 
-#if !__EFUN_DEFINED__(copy_file)
-#define MAXLEN 50000
-public nomask int copy_file(string source, string dest)
-{
-
-    int ptr;
-    bytes byte_seq;
-
-    set_this_object(previous_object());
-    if (!sizeof(source) || !sizeof(dest) || source==dest
-        || (file_size(source) < 0) // kein File?
-        || !master()->valid_read(source,
-                       getuid(this_interactive()||previous_object()),
-                       "read_file",previous_object())
-        || !master()->valid_write(dest,
-                       getuid(this_interactive()||previous_object()),
-                       "write_file",previous_object())
-       )
-      return 1;
-
-    switch (file_size(dest))
-    {
-    case -1:
-      break;
-    case -2:
-      if (dest[<1]!='/') dest+="/";
-      dest+=efun::explode(source,"/")[<1];
-      if (file_size(dest)==-2) return 1;
-      if (file_size(dest)!=-1) break;
-    default:
-      if (!rm(dest)) return 1;
-      break;
-    }
-    do
-    {
-      byte_seq = read_bytes(source, ptr, MAXLEN); ptr += MAXLEN;
-      if (!byte_seq) byte_seq="";
-      write_file(dest, byte_seq);
-    }
-    while(sizeof(byte_seq) == MAXLEN);
-    return 0;
-}
-#endif //!__EFUN_DEFINED__(copy_file)
-
 #undef PO
 

secure/simul_efun/spare/files.c

diff --git a/secure/simul_efun/spare/files.c b/secure/simul_efun/spare/files.c
index e967367..818f2f4 100644
--- a/secure/simul_efun/spare/files.c
+++ b/secure/simul_efun/spare/files.c
@@ -84,49 +84,5 @@
     return(write_file(file,txt));
 }
 
-#if !__EFUN_DEFINED__(copy_file)
-#define MAXLEN 50000
-public nomask int copy_file(string source, string dest)
-{
-
-    int ptr;
-    bytes byte_seq;
-
-    set_this_object(previous_object());
-    if (!sizeof(source) || !sizeof(dest) || source==dest
-        || (file_size(source) < 0) // kein File?
-        || !master()->valid_read(source,
-                       getuid(this_interactive()||previous_object()),
-                       "read_file",previous_object())
-        || !master()->valid_write(dest,
-                       getuid(this_interactive()||previous_object()),
-                       "write_file",previous_object())
-       )
-      return 1;
-
-    switch (file_size(dest))
-    {
-    case -1:
-      break;
-    case -2:
-      if (dest[<1]!='/') dest+="/";
-      dest+=efun::explode(source,"/")[<1];
-      if (file_size(dest)==-2) return 1;
-      if (file_size(dest)!=-1) break;
-    default:
-      if (!rm(dest)) return 1;
-      break;
-    }
-    do
-    {
-      byte_seq = read_bytes(source, ptr, MAXLEN); ptr += MAXLEN;
-      if (!byte_seq) byte_seq="";
-      write_file(dest, byte_seq);
-    }
-    while(sizeof(byte_seq) == MAXLEN);
-    return 0;
-}
-#endif //!__EFUN_DEFINED__(copy_file)
-
 #undef PO