Split code to generate "rwx-----" strings into lib/permstring.c so it

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index d917f07..ada4046 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,6 +2,7 @@
     
     Copyright (C) 1996-2000 by Andrew Tridgell 
     Copyright (C) Paul Mackerras 1996
+    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -153,6 +154,7 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out)
        pid_t pid;
        int to_child_pipe[2];
        int from_child_pipe[2];
+       extern int read_batch;  /* dw */
 
        if (fd_pair(to_child_pipe) < 0 ||
            fd_pair(from_child_pipe) < 0) {
@@ -171,7 +173,10 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out)
                extern int am_sender;
                extern int am_server;
 
-               am_sender = !am_sender;
+               if (read_batch)
+                   am_sender = 0;
+               else
+                   am_sender = !am_sender;
                am_server = 1;          
 
                if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
@@ -558,10 +563,7 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs)
        s = strdup(s);
        if (!s) out_of_memory("glob_expand");
 
-       base = (char *)malloc(strlen(base1)+3);
-       if (!base) out_of_memory("glob_expand");
-
-       sprintf(base," %s/", base1);
+       if (asprintf(&base," %s/", base1) <= 0) out_of_memory("glob_expand");
 
        q = s;
        while ((p = strstr(q,base)) && ((*argc) < maxargs)) {
@@ -588,33 +590,6 @@ void strlower(char *s)
        }
 }
 
-/* this is like vsnprintf but it always null terminates, so you
-   can fit at most n-1 chars in */
-int vslprintf(char *str, int n, const char *format, va_list ap)
-{
-       int ret = vsnprintf(str, n, format, ap);
-       if (ret >= n || ret < 0) {
-               str[n-1] = 0;
-               return -1;
-       }
-       str[ret] = 0;
-       return ret;
-}
-
-
-/* like snprintf but always null terminates */
-int slprintf(char *str, int n, char *format, ...)
-{
-       va_list ap;  
-       int ret;
-
-       va_start(ap, format);
-       ret = vslprintf(str,n,format,ap);
-       va_end(ap);
-       return ret;
-}
-
-
 void *Realloc(void *p, int size)
 {
        if (!p) return (void *)malloc(size);
@@ -931,10 +906,13 @@ char *timestring(time_t t)
 }
 
 
-/*******************************************************************
-sleep for a specified number of milliseconds
-********************************************************************/
-void msleep(int t)
+/**
+ * Sleep for a specified number of milliseconds.
+ *
+ * Always returns TRUE.  (In the future it might return FALSE if
+ * interrupted.)
+ **/
+int msleep(int t)
 {
        int tdiff=0;
        struct timeval tval,t1,t2;  
@@ -953,6 +931,8 @@ void msleep(int t)
                tdiff = (t2.tv_sec - t1.tv_sec)*1000 + 
                        (t2.tv_usec - t1.tv_usec)/1000;
        }
+
+       return True;
 }
 
 
@@ -987,9 +967,9 @@ int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
 {
        static int (*fn)();
        int ret;
-       char cmd[1024];
+       char *cmd;
 
-       sprintf(cmd, "/usr/X11R6/bin/xterm -display :0 -T Panic -n Panic -e /bin/sh -c 'cat /tmp/ierrs.*.%d ; gdb /proc/%d/exe %d'", 
+       asprintf(&cmd, "/usr/X11R6/bin/xterm -display :0 -T Panic -n Panic -e /bin/sh -c 'cat /tmp/ierrs.*.%d ; gdb /proc/%d/exe %d'", 
                getpid(), getpid(), getpid());
 
        if (!fn) {
@@ -1002,6 +982,8 @@ int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
 
        system(cmd);
 
+       free(cmd);
+
        return ret;
 }
 #endif