Merge cp.h into stagit.c

diff --git a/src/cp.h b/src/cp.h
index 1372b5b6ed61ba913e68fa074d7d6189e761b348..876b21eda23cc47bd0d02305376fb5781d0e0398 100644 (file)
--- a/src/cp.h
+++ b/src/cp.h
@@ -1,25 +1 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-int cp(char fileSource[], char fileDestination[])
-{
-    int c;
-    FILE *stream_R, *stream_W; 
-
-    stream_R = fopen(fileSource, "r");
-    if (stream_R == NULL)
-        return -1;
-    stream_W = fopen(fileDestination, "w");   //create and write to file
-    if (stream_W == NULL)
-     {
-        fclose(stream_R);
-        return -2;
-     }    
-    while ((c = fgetc(stream_R)) != EOF)
-        fputc(c, stream_W);
-    fclose(stream_R);
-    fclose(stream_W);
-
-    return 0;
-}
-
+int cp(const char fileSource[], const char fileDestination[]);

diff --git a/src/stagit.c b/src/stagit.c
index b71eeda0db64c440eceda86eb7940ded010f574f..eef927ea8ded24b6dc5ca59fb3fa181adb4b66f4 100644 (file)
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -78,6 +78,29 @@ static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */
 static FILE *rcachefp, *wcachefp;
 static const char *cachefile;
 
+int
+cp(const char fileSource[], const char fileDestination[])
+{
+       int c;
+       FILE *stream_R, *stream_W; 
+
+       stream_R = fopen(fileSource, "r");
+       if (stream_R == NULL)
+               return -1;
+       stream_W = fopen(fileDestination, "w");   //create and write to file
+       if (stream_W == NULL)
+       {
+               fclose(stream_R);
+               return -2;
+       }    
+       while ((c = fgetc(stream_R)) != EOF)
+               fputc(c, stream_W);
+       fclose(stream_R);
+       fclose(stream_W);
+
+       return 0;
+}
+
 void
 joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
 {