Use MY_UID() instead of getuid().

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index b40922a..f60ca6c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -979,7 +979,7 @@ int main(int argc,char *argv[])
 #endif /* def MAINTAINER_MODE */
 
        starttime = time(NULL);
-       am_root = (getuid() == 0);
+       am_root = (MY_UID() == 0);
 
        memset(&stats, 0, sizeof(stats));
 
@@ -1013,6 +1013,8 @@ int main(int argc,char *argv[])
         * that implement getcwd that way "pwd" can't be found after chroot. */
        push_dir(NULL);
 
+       init_flist();
+
        if (write_batch && !am_server) {
                write_batch_argvs_file(orig_argc, orig_argv);
        }
@@ -1028,13 +1030,6 @@ int main(int argc,char *argv[])
        if (dry_run)
                verbose = MAX(verbose,1);
 
-#ifndef SUPPORT_LINKS
-       if (!am_server && preserve_links) {
-               rprintf(FERROR,"ERROR: symbolic links not supported\n");
-               exit_cleanup(RERR_UNSUPPORTED);
-       }
-#endif
-
        if (am_server) {
                set_nonblocking(STDIN_FILENO);
                set_nonblocking(STDOUT_FILENO);