send_file() and friends are now mr_send_file(), etc.

diff --git a/update/client.c b/update/client.c
index 8b8f46c8bbbf7b540b1212620b19f057d2184cc4..160d6d1d28cd7bb4c09f6003e144602990485fda 100644 (file)
--- a/update/client.c
+++ b/update/client.c
@@ -25,7 +25,7 @@ RCSID("$Header$");
 extern des_cblock session;
 extern char *whoami;
 
-int send_auth(int conn, char *host_name)
+int mr_send_auth(int conn, char *host_name)
 {
   KTEXT_ST ticket_st;
   int code, auth_version = 2;
@@ -87,7 +87,7 @@ int send_auth(int conn, char *host_name)
   return MR_SUCCESS;
 }
 
-int execute(int conn, char *path)
+int mr_execute(int conn, char *path)
 {
   long response;
   char *data;
@@ -110,7 +110,7 @@ int execute(int conn, char *path)
   return MR_SUCCESS;
 }
 
-void send_quit(int conn)
+void mr_send_quit(int conn)
 {
   send_string(conn, "quit", 5);
 }

diff --git a/update/send_file.c b/update/send_file.c
index 9a0960b2c42b25370b3e109ff8916d8cc7f191d9..2ebb245e1e97c99ebc14ff855b8c9192b981637d 100644 (file)
--- a/update/send_file.c
+++ b/update/send_file.c
@@ -41,7 +41,7 @@ extern des_cblock session;
  *  1 on error (file not found, etc)
  */
 
-int send_file(int conn, char *pathname, char *target_path, int encrypt)
+int mr_send_file(int conn, char *pathname, char *target_path, int encrypt)
 {
   int n, fd, code, n_to_send, i;
   char data[UPDATE_BUFSIZ], enc[UPDATE_BUFSIZ];

diff --git a/update/update_test.c b/update/update_test.c
index 9080fc78a6420f9f42fca633861300bfbdd66190..4511acfbb288bd394fe762dcfc27894979af0353 100644 (file)
--- a/update/update_test.c
+++ b/update/update_test.c
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
       exit(1);
     }
 
-  code = send_auth(conn, host);
+  code = mr_send_auth(conn, host);
   if (code)
     com_err(whoami, code, "attempting authorization");
 
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
          file = argv[++i];
          rfile = argv[++i];
          fprintf(stderr, "Sending file %s to %s as %s\n", file, host, rfile);
-         send_file(conn, file, rfile, 0);
+         mr_send_file(conn, file, rfile, 0);
          break;
        case 'S':
          if (i + 2 >= argc)
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
          rfile = argv[++i];
          fprintf(stderr, "Sending (encrypted) file %s to %s as %s\n",
                  file, host, rfile);
-         send_file(conn, file, rfile, 1);
+         mr_send_file(conn, file, rfile, 1);
          break;
        case 'i':
          if (i + 1 >= argc)
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
          mktemp(ibuf);
          fprintf(stderr, "Sending instructions %s to %s as %s\n",
                  file, host, ibuf);
-         send_file(conn, file, ibuf, 0);
+         mr_send_file(conn, file, ibuf, 0);
          break;
        case 'I':
          if (i + 2 >= argc)
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
          strcpy(ibuf, rfile);
          fprintf(stderr, "Sending instructions %s to %s as %s\n",
                  file, host, ibuf);
-         send_file(conn, file, ibuf, 0);
+         mr_send_file(conn, file, ibuf, 0);
          break;
        case 'x':
          if (!ibuf)
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
              usage();
            }
          fprintf(stderr, "Executing instructions %s on %s\n", ibuf, host);
-         code = execute(conn, ibuf);
+         code = mr_execute(conn, ibuf);
          if (code)
            com_err(whoami, code, "executing");
          break;
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
            usage();
          file = argv[++i];
          fprintf(stderr, "Executing instructions %s on %s\n", file, host);
-         code = execute(conn, file);
+         code = mr_execute(conn, file);
          if (code)
            com_err(whoami, code, "executing");
          break;
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
          usage();
        }
     }
-  send_quit(conn);
+  mr_send_quit(conn);
   close(conn);
   exit(code);
 }