From 95a38e8684439082bd86a988e593939e10172881 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 5 Jan 1998 23:30:44 +0000 Subject: [PATCH] cosmetic changes only - minor correction to --update docs - don't print "building file list" stuff when building a local file list for use in the --delete code. - remove some spaces at the end of lines in Makefile.in --- Makefile.in | 10 +++++----- flist.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index bc623bd9..6b93fea7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,9 +7,9 @@ INSTALL_BIN=$(exec_prefix)/bin INSTALL_MAN=$(prefix)/man LIBS=@LIBS@ -CC=@CC@ +CC=@CC@ CFLAGS=@CFLAGS@ - + INSTALLCMD=@INSTALL@ SRC=@srcdir@ @@ -20,7 +20,7 @@ SHELL=/bin/sh .SUFFIXES: .c .o LIBOBJ=lib/getopt.o lib/fnmatch.o lib/zlib.o -OBJS1=rsync.o exclude.o util.o md4.o main.o checksum.o match.o +OBJS1=rsync.o exclude.o util.o md4.o main.o checksum.o match.o OBJS=$(OBJS1) flist.o io.o compat.o hlink.o token.o $(LIBOBJ) .c.o: @@ -32,7 +32,7 @@ install: all ${INSTALLCMD} -m 755 rsync ${INSTALL_BIN} ${INSTALLCMD} -m 644 rsync.1 ${INSTALL_MAN}/man1 -rsync: $(OBJS) +rsync: $(OBJS) $(CC) $(CFLAGS) -o rsync $(OBJS) $(LIBS) proto: @@ -41,7 +41,7 @@ proto: clean: rm -f *~ $(OBJS) rsync config.cache config.log config.status -dist: +dist: tar --exclude-from .ignore -czf dist.tar.gz . -mkdir rsync-$(VERSION) (cd rsync-$(VERSION) ; tar xzf ../dist.tar.gz) diff --git a/flist.c b/flist.c index c59d9340..894cf16c 100644 --- a/flist.c +++ b/flist.c @@ -413,7 +413,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) char dbuf[MAXPATHLEN]; struct file_list *flist; - if (verbose && recurse && !am_server) { + if (verbose && recurse && !am_server && f != -1) { fprintf(FINFO,"building file list ... "); fflush(FINFO); } @@ -497,7 +497,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) write_flush(f); } - if (verbose && recurse && !am_server) + if (verbose && recurse && !am_server && f != -1) fprintf(FINFO,"done\n"); clean_flist(flist); -- 2.34.1