Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kristapsdz/openrsync
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: KlaraSystems/openrsync
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
4 contributors
Loading
Showing with 51,770 additions and 1,687 deletions.
  1. +23 −4 Makefile
  2. +358 −0 batch.c
  3. +123 −55 blocks.c
  4. +341 −0 cleanup.c
  5. +80 −14 client.c
  6. +66 −0 compats.c
  7. +12 −0 configure
  8. +506 −7 copy.c
  9. +1,493 −0 daemon.c
  10. +95 −0 daemon.h
  11. +815 −0 daemon_cfg.c
  12. +1,704 −0 daemon_misc.c
  13. +1,490 −132 downloader.c
  14. +687 −46 extern.h
  15. +359 −38 fargs.c
  16. +1,739 −289 flist.c
  17. +42 −3 hash.c
  18. +17 −6 ids.c
  19. +809 −63 io.c
  20. +845 −13 log.c
  21. +1,671 −197 main.c
  22. +39 −0 md4.h
  23. +45 −0 misc.c
  24. +54 −2 mkpath.c
  25. +89 −59 mktemp.c
  26. +870 −7 openrsync.1
  27. +434 −0 platform.c
  28. +552 −104 receiver.c
  29. +8 −3 rmatch.c
  30. +26 −7 rsync.5
  31. +539 −0 rsyncd.conf.5
  32. +1,233 −154 rules.c
  33. +1,053 −90 sender.c
  34. +85 −26 server.c
  35. +162 −68 session.c
  36. +759 −55 socket.c
  37. +152 −0 strmode.c
  38. +12 −0 tests.c
  39. +24 −0 tests/DESIGN
  40. +103 −0 tests/README.md
  41. +81 −0 tests/TODO
  42. +4 −0 tests/cstream/.gitignore
  43. +259 −0 tests/cstream/CHANGES
  44. +23 −0 tests/cstream/COPYRIGHT
  45. +10 −0 tests/cstream/INSTALLATION
  46. +9 −0 tests/cstream/Makefile.am
  47. +873 −0 tests/cstream/Makefile.in
  48. +32 −0 tests/cstream/README
  49. +76 −0 tests/cstream/TODO
  50. +1,150 −0 tests/cstream/aclocal.m4
  51. 0 tests/cstream/auxdir/Makefile.am
  52. +400 −0 tests/cstream/auxdir/Makefile.in
  53. +348 −0 tests/cstream/auxdir/compile
  54. +411 −0 tests/cstream/auxdir/depcomp
  55. +250 −0 tests/cstream/auxdir/install-sh
  56. +134 −0 tests/cstream/auxdir/missing
  57. +40 −0 tests/cstream/auxdir/mkinstalldirs
  58. +6,384 −0 tests/cstream/configure
  59. +79 −0 tests/cstream/configure.in
  60. +266 −0 tests/cstream/cstream.1
  61. +1,951 −0 tests/cstream/cstream.c
  62. +2 −0 tests/cstream/tests/Makefile.am
  63. +401 −0 tests/cstream/tests/Makefile.in
  64. +15 −0 tests/cstream/tests/test1.log1
  65. +96 −0 tests/cstream/tests/test1.log2
  66. +60 −0 tests/cstream/tests/test1.log3
  67. +707 −0 tests/cstream/tests/test1.log4
  68. +96 −0 tests/cstream/tests/test1.sh
  69. +3 −0 tests/cstream/tests/vars.sh
  70. +9 −0 tests/src/.gitignore
  71. +24 −0 tests/src/Makefile
  72. +3 −0 tests/src/conf.sh
  73. +143 −0 tests/src/generate-kyua
  74. +246 −0 tests/src/lib.sh
  75. +129 −0 tests/src/run-test.sh
  76. +108 −0 tests/src/sparseme.c
  77. +20 −0 tests/src/test0_noslash.test
  78. +29 −0 tests/src/test10_perms.test
  79. +26 −0 tests/src/test10b_perms.test
  80. +40 −0 tests/src/test11_middlediff.test
  81. +44 −0 tests/src/test11b_middlediff.test
  82. +20 −0 tests/src/test12_inex.test
  83. +19 −0 tests/src/test12b_inex.test
  84. +19 −0 tests/src/test12c_inex.test
  85. +20 −0 tests/src/test12d_inex.test
  86. +37 −0 tests/src/test13_sparse.test
  87. +36 −0 tests/src/test13b_sparse.test
  88. +23 −0 tests/src/test14_hardlinks.test
  89. +28 −0 tests/src/test14b_hardlinks.test
  90. +28 −0 tests/src/test14c_hardlinks.test
  91. +31 −0 tests/src/test14d_hardlinks.test
  92. +30 −0 tests/src/test14e_hardlinks.test
  93. +21 −0 tests/src/test15a_tofile.test
  94. +24 −0 tests/src/test15b_tofile.test
  95. +29 −0 tests/src/test16_symlinks.test
  96. +29 −0 tests/src/test16a_symlinks.test
  97. +32 −0 tests/src/test16b_symlinks.test
  98. +32 −0 tests/src/test16c_symlinks.test
  99. +27 −0 tests/src/test17_existing.test
  100. +25 −0 tests/src/test17a_existing.test
  101. +36 −0 tests/src/test17b_existing.test
  102. +18 −0 tests/src/test18_nop.test
  103. +30 −0 tests/src/test19_linkdest.test
  104. +30 −0 tests/src/test19b_linkdest-rel.test
  105. +18 −0 tests/src/test1_minusa.test
  106. +18 −0 tests/src/test20_dlupdates.test
  107. +122 −0 tests/src/test21_delopts.test
  108. +43 −0 tests/src/test22_inplace.test
  109. +139 −0 tests/src/test23_append.test
  110. +33 −0 tests/src/test24_removesource.test
  111. +18 −0 tests/src/test25_filter_basic.test
  112. +18 −0 tests/src/test25_filter_basic_clear.test
  113. +44 −0 tests/src/test25_filter_basic_cvs.test
  114. +89 −0 tests/src/test25_filter_clear.test
  115. +72 −0 tests/src/test25_filter_default.test
  116. +56 −0 tests/src/test25_filter_dir.test
  117. +34 −0 tests/src/test25_filter_merge.test
  118. +25 −0 tests/src/test25_filter_merge_cvs.test
  119. +60 −0 tests/src/test25_filter_merge_mods.test
  120. +51 −0 tests/src/test25_filter_mods.test
  121. +31 −0 tests/src/test25_filter_receiver.test
  122. +32 −0 tests/src/test25_filter_sender.test
  123. +74 −0 tests/src/test26_update.test
  124. +99 −0 tests/src/test27_checksum.test
  125. +73 −0 tests/src/test28_size_only.test
  126. +101 −0 tests/src/test29_missing_ids.test
  127. +22 −0 tests/src/test2_minusexclude.test
  128. +60 −0 tests/src/test30_file_update.test
  129. +33 −0 tests/src/test31_rsh.test
  130. +20 −0 tests/src/test32_bigfile.test
  131. +28 −0 tests/src/test33_bigid.test
  132. +27 −0 tests/src/test34_desync.test
  133. +87 −0 tests/src/test35_checksum_seed.test
  134. +134 −0 tests/src/test36_block_size.test
  135. +109 −0 tests/src/test37_chmod.test
  136. +91 −0 tests/src/test38_executability.test
  137. +38 −0 tests/src/test39_quiet.test
  138. +22 −0 tests/src/test3_minusexclude.test
  139. +22 −0 tests/src/test3b_minusexclude.test
  140. +22 −0 tests/src/test3c_minusexclude.test
  141. +22 −0 tests/src/test3d_minusexclude.test
  142. +22 −0 tests/src/test3e_minusexclude.test
  143. +148 −0 tests/src/test40_backup.test
  144. +237 −0 tests/src/test41_backup_dir.test
  145. +101 −0 tests/src/test42_copy_dest.test
  146. +65 −0 tests/src/test43_whole_file.test
  147. +179 −0 tests/src/test44_temp_dir.test
  148. +57 −0 tests/src/test45_force.test
  149. +174 −0 tests/src/test46_copy_unsafe_links.test
  150. +68 −0 tests/src/test47_keep_dirlinks.test
  151. +96 −0 tests/src/test48_safe_links.test
  152. +75 −0 tests/src/test49_omit_dir_times.test
  153. +23 −0 tests/src/test4_excludedir.test
  154. +21 −0 tests/src/test50_empty_flist.test
  155. +37 −0 tests/src/test51_dupe_src.test
  156. +20 −0 tests/src/test52_version_output.test
  157. +94 −0 tests/src/test53_ipv4_ipv6.test
  158. +99 −0 tests/src/test54_max_delete.test
  159. +210 −0 tests/src/test56_fuzzy.test
  160. +42 −0 tests/src/test57_stat_error.test
  161. +44 −0 tests/src/test57b_copylinks_stat_error.test
  162. +33 −0 tests/src/test58_long_file_names.test
  163. +99 −0 tests/src/test59_ignore_errors.test
  164. +45 −0 tests/src/test5_symlink-kills-dir.test
  165. +46 −0 tests/src/test5b_symlink-kills-dir.test
  166. +30 −0 tests/src/test61_minmax.test
  167. +30 −0 tests/src/test61b_minmax.test
  168. +30 −0 tests/src/test61c_minmax.test
  169. +32 −0 tests/src/test61d_minmax.test
  170. +32 −0 tests/src/test61e_minmax.test
  171. +32 −0 tests/src/test61f_minmax.test
  172. +32 −0 tests/src/test61g_minmax.test
  173. +31 −0 tests/src/test61h_minmax.test
  174. +190 −0 tests/src/test62_compress.test
  175. +22 −0 tests/src/test63_relative.test
  176. +35 −0 tests/src/test64_noimpdirs.test
  177. +29 −0 tests/src/test65_bwlimits.test
  178. +40 −0 tests/src/test66_partial.test
  179. +37 −0 tests/src/test67_partial_dir.test
  180. +24 −0 tests/src/test68_copydirlinks.test
  181. +26 −0 tests/src/test69_dirs.test
  182. +26 −0 tests/src/test6_perms.test
  183. +32 −0 tests/src/test6b_perms.test
  184. +85 −0 tests/src/test70_prunedirs.test
  185. +198 −0 tests/src/test74_filesfrom.test
  186. +50 −0 tests/src/test76_list_only.test
  187. +26 −0 tests/src/test7_symlinks.test
  188. +23 −0 tests/src/test7b_symlinks.test
  189. +32 −0 tests/src/test8_times.test
  190. +38 −0 tests/src/test8b_times.test
  191. +21 −0 tests/src/test9_norecurse.test
  192. +1,319 −245 uploader.c
  193. +855 −0 zlib/ChangeLog
  194. +125 −0 zlib/README
  195. +31 −0 zlib/README.rsync
  196. +149 −0 zlib/adler32.c
  197. +79 −0 zlib/compress.c
  198. +423 −0 zlib/crc32.c
  199. +441 −0 zlib/crc32.h
  200. +1,768 −0 zlib/deflate.c
  201. +331 −0 zlib/deflate.h
  202. +2 −0 zlib/dummy
  203. +2 −0 zlib/dummy.in
  204. +318 −0 zlib/inffast.c
  205. +11 −0 zlib/inffast.h
  206. +94 −0 zlib/inffixed.h
  207. +1,368 −0 zlib/inflate.c
  208. +119 −0 zlib/inflate.h
  209. +329 −0 zlib/inftrees.c
  210. +55 −0 zlib/inftrees.h
  211. +1,219 −0 zlib/trees.c
  212. +128 −0 zlib/trees.h
  213. +332 −0 zlib/zconf.h
  214. +1,358 −0 zlib/zlib.h
  215. +318 −0 zlib/zutil.c
  216. +272 −0 zlib/zutil.h
27 changes: 23 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
include Makefile.configure

OBJS = blocks.o \
OBJS = batch.o \
blocks.o \
cleanup.o \
client.o \
compats.o \
copy.o \
daemon.o \
daemon_cfg.o \
daemon_misc.o \
downloader.o \
fargs.o \
flist.o \
@@ -15,16 +20,29 @@ OBJS = blocks.o \
misc.o \
mkpath.o \
mktemp.o \
platform.o \
receiver.o \
rmatch.o \
rules.o \
sender.o \
server.o \
session.o \
socket.o \
strmode.o \
symlinks.o \
uploader.o
ALLOBJS = $(OBJS) \

ZLIBOBJS = zlib/adler32.o \
zlib/compress.o \
zlib/crc32.o \
zlib/deflate.o \
zlib/inffast.o \
zlib/inflate.o \
zlib/inftrees.o \
zlib/trees.o \
zlib/zutil.o

ALLOBJS = $(OBJS) $(ZLIBOBJS) \
main.o
AFLS = afl/test-blk_recv \
afl/test-flist_recv
@@ -34,7 +52,7 @@ all: openrsync
afl: $(AFLS)

openrsync: $(ALLOBJS)
$(CC) $(LDFLAGS) -o $@ $(ALLOBJS) -lm $(LDADD_LIB_SOCKET) $(LDADD_SCAN_SCALED)
$(CC) $(LDFLAGS) -o $@ $(ALLOBJS) -lm -lutil -lsbuf $(LDADD_LIB_SOCKET) $(LDADD_SCAN_SCALED)

$(AFLS): $(OBJS)
$(CC) $(LDFLAGS) -o $@ $*.c $(OBJS)
@@ -44,14 +62,15 @@ install: all
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man5
$(INSTALL_MAN) openrsync.1 $(DESTDIR)$(MANDIR)/man1
$(INSTALL_MAN) rsync.5 rsyncd.5 $(DESTDIR)$(MANDIR)/man5
$(INSTALL_MAN) rsync.5 rsyncd.5 rsyncd.conf.5 $(DESTDIR)$(MANDIR)/man5
$(INSTALL_PROGRAM) openrsync $(DESTDIR)$(BINDIR)

uninstall:
rm -f $(DESTDIR)$(BINDIR)/openrsync
rm -f $(DESTDIR)$(MANDIR)/man1/openrsync.1
rm -f $(DESTDIR)$(MANDIR)/man5/rsync.5
rm -f $(DESTDIR)$(MANDIR)/man5/rsyncd.5
rm -f $(DESTDIR)$(MANDIR)/man5/rsyncd.conf.5

clean:
rm -f $(ALLOBJS) openrsync $(AFLS)
Loading