diff --git a/AUTHORS b/AUTHORS index 8458884..f7108f8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,7 @@ Main files ========== -Camilla Berglund wrote the first +Camilla Löwy wrote the first version of duff and is currently its main developer. Duff contains and uses the SHA1 message digest code from the sha-asaddi diff --git a/COPYING b/COPYING index faf90ec..05595b9 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ duff - Duplicate file finder -Copyright (c) 2005 Camilla Berglund +Copyright (c) 2005 Camilla Löwy This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any diff --git a/ChangeLog b/ChangeLog index b34d6bd..fa95f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,42 +3,42 @@ Change log for duff Maintained since version 0.3.1. -2015-08-13 Camilla Berglund +2015-08-13 Camilla Löwy * duff.c duff.h duffdriver.c dufffile.c duffstring.c duffstring.h duffutil.c: Changed indent width. * duffdriver.c (process_path): Decreased nesting depth. -2013-09-13 Camilla Berglund +2013-09-13 Camilla Löwy * duffutil.c (set_digest_function): Changed to accept a string. * duff.h duff.c duffutil.c: Made all digest function selection logic local to util module. -2013-07-23 Camilla Berglund +2013-07-23 Camilla Löwy * dufffile.c (compare_files): Cleaned up devnode comparison logic. -2013-07-21 Camilla Berglund +2013-07-21 Camilla Löwy * dufffile.c duffutil.c: Removed superfluous casts of malloc and realloc. -2012-09-21 Camilla Berglund +2012-09-21 Camilla Löwy * duffdriver.c (follow_links_mode): Corrected type (credits to Michael Tautschnig). -2012-09-07 Camilla Berglund +2012-09-07 Camilla Löwy * join-duplicates.sh: Removed redundant use of touch(1). -2012-03-30 Camilla Berglund +2012-03-30 Camilla Löwy * configure.ac: Enabled ISO Standard C. * duff.h duffdriver.c: Corrected order of types and typedefs. -2012-02-19 Camilla Berglund +2012-02-19 Camilla Löwy * duffdriver.c (process_directory): Made asprintf error exit. @@ -47,7 +47,7 @@ Maintained since version 0.3.1. * join-duplicates.sh: Added missing IFS clearing. -2012-02-15 Camilla Berglund +2012-02-15 Camilla Löwy * duff.h duffutil.c (init_digest): Renamed from digest_init. * duff.h duffutil.c (update_digest): Renamed from digest_update. @@ -57,7 +57,7 @@ Maintained since version 0.3.1. * duff.1: Updated examples. * join-duplicates.sh: Fixed a few duff invocation bugs. -2012-02-13 Camilla Berglund +2012-02-13 Camilla Löwy * duff.1: Added documentation for -u flag. * duff.h (DUPLICATE): Renamed from REPORTED. @@ -66,7 +66,7 @@ Maintained since version 0.3.1. * duff.c (main, usage): Added -u flag for listing unique instead of duplicate files. -2012-02-12 Camilla Berglund +2012-02-12 Camilla Löwy * duffutil.c duff.h (PATH_SIZE_STEP): Added constant macro. @@ -76,7 +76,7 @@ Maintained since version 0.3.1. * duff.1: Various clarifications. -2012-01-28 Camilla Berglund +2012-01-28 Camilla Löwy * dufffile.c (compare_files): Removed superflous physical_flag test. * duff.h dufffile.c (init_file_list): Renamed from file_list_init. @@ -92,7 +92,7 @@ Maintained since version 0.3.1. * duffutil.c (get_field_terminator): Added function. * duffutil.c (read_path): Removed limit on path length, updated signature. -2012-01-27 Camilla Berglund +2012-01-27 Camilla Löwy * dufffile.c (compare_entry_contents): Made warnings take -q into account. * dufffile.c (get_file_sample): Tagged file INVALID on read error. @@ -105,14 +105,14 @@ Maintained since version 0.3.1. * dufffile.c (get_file_sample, get_file_digest): Removed duplicate check for INVALID state. -2012-01-25 Camilla Berglund +2012-01-25 Camilla Löwy * duff.h (Status): Removed unused DUPLICATE status. * duffdriver.c (process_file): Removed read permission check on files (credits to Kamal Mostafa). -2012-01-24 Camilla Berglund +2012-01-24 Camilla Löwy * duff.h (HASH_BITS): Increased to 10. @@ -142,7 +142,7 @@ Maintained since version 0.3.1. * duff.1: Fixed statement claiming digests are calculated in thorough mode. -2012-01-23 Camilla Berglund +2012-01-23 Camilla Löwy * duffdriver.c (process_args, process_clusters): Moved freeing of entries to directly after each bucket has been processed. @@ -183,29 +183,29 @@ Maintained since version 0.3.1. * duff.1 duff.c: Changed default sampling limit to zero. -2012-01-22 Camilla Berglund +2012-01-22 Camilla Löwy * duff.c duff.h duffentry.c: Changed sampling to read (up to) the first SAMPLE_SIZE bytes (credits to Kamal Mostafa). * duff.c: Clarified help for -H and -L flags. * duff.c: Added list of supported digest functions to help for -d flag. -2012-01-20 Camilla Berglund +2012-01-20 Camilla Löwy * duff.1: Added missing -type f to example (credits to Stephan Hegel). -2012-01-19 Camilla Berglund +2012-01-19 Camilla Löwy * duff.h: Tagged functions error and warning with GCC attributes. * duff.1: Clarified default sampling limit. * duffdriver.c: Renamed cluster index variable to index. -2012-01-18 Camilla Berglund +2012-01-18 Camilla Löwy * duff.1: Clarified language regarding -t and %d. * duff.1: Made the output of examples human-readable. -2012-01-16 Camilla Berglund +2012-01-16 Camilla Löwy * duff.1: Added new cluster header to description of -f flag. * duff.c (main): Added error if thorough mode output uses digest (credits to @@ -213,7 +213,7 @@ Maintained since version 0.3.1. * duff.c (main): Added non-digest default cluster header for thorough mode. * duffutil.c duff.h: Added function cluster_header_uses_digest. -2011-04-11 Camilla Berglund +2011-04-11 Camilla Löwy * duff.c (main): Made cluster header translatable. * duffutil.c (error): Changed exit status to EXIT_FAILURE. @@ -227,7 +227,7 @@ Maintained since version 0.3.1. (EXTRA_DIST): Add config.rpath, m4/ChangeLog. * configure.ac (AC_OUTPUT): Add po/Makefile.in. -2011-04-10 Camilla Berglund +2011-04-10 Camilla Löwy * duff.c duff.h duffdriver.c duffentry.c: Changed gettext macro to _. * gettext.h: Added file to lib directory. @@ -236,50 +236,50 @@ Maintained since version 0.3.1. * duff.c duff.h duffdriver.c duffentry.c duffutil.c duffstring.c: Moved to use autoconf large file support detection. -2010-08-15 Camilla Berglund +2010-08-15 Camilla Löwy * duff.c (usage): Annotated strings for i18n. * duff.c (main): Made digest function name comparison case-insensitive. -2009-09-21 Camilla Berglund +2009-09-21 Camilla Löwy * duff.h: Added enum typedefs. -2009-09-20 Camilla Berglund +2009-09-20 Camilla Löwy * duff.c (version, usage, bugs): Changed to output to stdout. -2009-09-19 Camilla Berglund +2009-09-19 Camilla Löwy * bootstrap.sh: Added instruction to run configure. * duffentry.c (get_entry_digest): Removed broken optimization. * duff.1: Added note on file modification. * duff.h: Added struct typedefs. -2009-08-09 Camilla Berglund +2009-08-09 Camilla Löwy * duffdriver.c (recurse_directory): Added error handling for asprintf. * duffentry.c (get_entry_samples): Added error handling for fread. * duffutil.c (error, warning): Added error handling for asprintf. * duff.c (usage): Clarified wording of help text. -2009-01-16 Camilla Berglund +2009-01-16 Camilla Löwy * duff.c (read_path, kill_trailing_slashes): Moved functions into duffutil.c. * duff.h: Added declarations for read_path and kill_trailing_slashes. * duff.c (version): Annotated strings for i18n. -2009-01-05 Camilla Berglund +2009-01-05 Camilla Löwy * duff.c (main): Moved option default values into source file. * duff.c (main) (usage): Renamed -c flag to -d. -2009-01-04 Camilla Berglund +2009-01-04 Camilla Löwy * duff.c duffdriver.c duffentry.c duffstring.c duffutil.c: Annotated strings for i18n. * duff.c (main): Added call to setlocale(3). -2009-01-03 Camilla Berglund +2009-01-03 Camilla Löwy * sha256.c: Added file. * sha256.h: Added file. @@ -297,24 +297,24 @@ Maintained since version 0.3.1. * duff.c duffdriver.c duffentry.c duffstring.c duffutil.c: Made off_t 64-bit on glibc. -2006-10-07 Camilla Berglund +2006-10-07 Camilla Löwy * duff.c (main): Always kill trailing slashes (and in a nicer way). * duff.c (kill_trailing_slashes): Added function. * duff.c (main) (read_path): Don't kill newlines for -0 option. -2006-09-29 Camilla Berglund +2006-09-29 Camilla Löwy * duff.c (main) (usage): Added -0 option (credits to Clemens Lucas Fries). * duff.c (read_path): Added function. * duffdriver.c (report_clusters): Added -0 option (credits to Clemens Lucas Fries). * duffutil.c (print_cluster_header): Removed newline termination. -2006-01-11 Camilla Berglund +2006-01-11 Camilla Löwy * duffdriver.c (stat_file): Added parenthesis to remove warning. -2006-01-09 Camilla Berglund +2006-01-09 Camilla Löwy * duff.h (copy_entry): Removed unused function. * duffentry.c (copy_entry): Removed unused function. @@ -325,11 +325,11 @@ Maintained since version 0.3.1. * join-duplicates.sh: Removed logging, added some error checking and mktemp. -2006-01-08 Camilla Berglund +2006-01-08 Camilla Löwy * join-duplicates.sh: Added file (credits to Ross Newell). -2006-01-07 Camilla Berglund +2006-01-07 Camilla Löwy * duffentry.c (get_entry_samples): Fixed seek bug (credits to Alexander Bostrom). @@ -345,7 +345,7 @@ Maintained since version 0.3.1. * duff.c (main): Improved warnings for -l option. -2006-01-04 Camilla Berglund +2006-01-04 Camilla Löwy * duffentry.c (compare_entries): Removed code for -z option. * duffdriver.c (stat_file): Do not collect empty files when using -z option. @@ -353,7 +353,7 @@ Maintained since version 0.3.1. * duffdriver.c (report_clusters): Fixed unlink bug. * duffdriver.c (report_clusters): All entries are now freed by the cluster search phase. -2006-01-03 Camilla Berglund +2006-01-03 Camilla Löwy * duff.h: Added inode and device fields to struct Entry (credits to Ross Newell). * duffdriver.c (process_path): Implemented physical mode (credits to Ross Newell). @@ -364,20 +364,20 @@ Maintained since version 0.3.1. * duffentry.c (make_entry): Added storing of device and inode fields. * duffdriver.c: Moved to using doubly-linked entries. -2005-12-14 Camilla Berglund +2005-12-14 Camilla Löwy * duffdriver.c (stat_file): Eliminated duplicate stat call for -L option. * duffdriver.c (stat_file): Added inital sketch for symlink-aware -e option. -2005-12-01 Camilla Berglund +2005-12-01 Camilla Löwy * duffutil.c (print_cluster_header): Fixed bug when printing off_t values on Mac OS X. * duffdriver.c: Added includes for building on Solaris. * duff.c: Added includes for building on Solaris. -2005-11-28 Camilla Berglund +2005-11-28 Camilla Löwy * duffdriver.c (has_recursed_directory) (record_directory): Added primitive directory loop detection. @@ -386,7 +386,7 @@ Maintained since version 0.3.1. * duffdriver.c: Added several additional TODO items. -2005-11-27 Camilla Berglund +2005-11-27 Camilla Löwy * duffdriver.c (report_clusters): Added freeing of entries. @@ -394,20 +394,20 @@ Maintained since version 0.3.1. * duff.c (main): Added file name reading from stdin. -2005-11-26 Camilla Berglund +2005-11-26 Camilla Löwy * duff.c (main, usage): Added -z option for ignoring empty files. * duff.c: Moved primary driver logic into duffdriver.c. * duffdriver.c: Created new file for primary driver logic. -2005-11-24 Camilla Berglund +2005-11-24 Camilla Löwy * duff.c: Added missing 't' to the getopt string (credits to Richard Levitte). * duffentry.c (compare_entries): Fixed bug in ordering of phases. -2005-11-23 Camilla Berglund +2005-11-23 Camilla Löwy * duff.c (usage): Fixed typo in -t option (credits to Patrik Jarnefelt). diff --git a/Makefile.am b/Makefile.am index 6b1f8f2..d1730e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = lib src po man dist_pkgdata_DATA = join-duplicates.sh -EXTRA_DIST = build-aux/config.rpath m4/ChangeLog HACKING +EXTRA_DIST = build-aux/config.rpath build-aux/config.rpath m4/ChangeLog HACKING dist_doc_DATA = README.SHA diff --git a/README b/README index 518f166..17817b0 100644 --- a/README +++ b/README @@ -32,7 +32,7 @@ The version numbering scheme for duff is as follows: 1. License and copyright ======================== -Duff is copyright (c) 2005 Camilla Berglund +Duff is copyright (c) 2005 Camilla Löwy Duff is licensed under the zlib/libpng license. See the file `COPYING' for license details. The license is also included at the top of each source file. @@ -132,7 +132,7 @@ See the file `HACKING'. Please send bug reports, feedback, patches and cookies to: - Camilla Berglund + Camilla Löwy 8. Credits and thanks diff --git a/configure.ac b/configure.ac index 8a6af3e..8a13d53 100644 --- a/configure.ac +++ b/configure.ac @@ -44,5 +44,5 @@ AC_CHECK_FUNCS([strdup strerror memset strchr strrchr strtoull], \ [], [AC_MSG_ERROR([Function not found])]) AC_CHECK_FUNCS([asprintf vasprintf]) -AC_OUTPUT([Makefile lib/Makefile src/Makefile po/Makefile.in man/Makefile]) +AC_OUTPUT([Makefile lib/Makefile src/Makefile po/Makefile.in man/Makefile po/Makefile.in]) diff --git a/join-duplicates.sh b/join-duplicates.sh index a057b8c..2728699 100644 --- a/join-duplicates.sh +++ b/join-duplicates.sh @@ -4,7 +4,7 @@ # # Copyright (c) 2005 Ross Newell # -# Modified Sep 7, 2012 by Camilla Berglund +# Modified Sep 7, 2012 by Camilla Löwy # # Uses duff to find duplicate physical files and changes them into hard links # to a single physical file, thus saving disk space. Use with care. diff --git a/man/duff.1 b/man/duff.1 index 76e152e..6c34730 100644 --- a/man/duff.1 +++ b/man/duff.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) Camilla Berglund +.\" Copyright (c) Camilla Löwy .\" This document is licensed under the zlib/libpng license. .\" Please see the file `COPYING' for license details. .\" @@ -207,7 +207,7 @@ The last stage of the pipeline converts the the ASCII NUL separators to newlines .Xr find 1 , .Xr xargs 1 .Sh AUTHORS -.An "Camilla Berglund" Aq dreda@dreda.org +.An "Camilla L\(:owy" Aq dreda@dreda.org .Sh BUGS .Nm doesn't yet check whether the same file has been specified twice on the command line. diff --git a/po/ChangeLog b/po/ChangeLog index 2a364df..fbab39e 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,9 +1,9 @@ -2011-04-11 Camilla Berglund +2011-04-11 Camilla Löwy * en.po: Added English "translation". -2011-04-10 Camilla Berglund +2011-04-10 Camilla Löwy * sv.po: Added Swedish translation. diff --git a/po/Makevars b/po/Makevars index 9ca7377..0660c0d 100644 --- a/po/Makevars +++ b/po/Makevars @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = Camilla Berglund +COPYRIGHT_HOLDER = Camilla Löwy # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: diff --git a/po/en.po b/po/en.po index 84047c8..3b5d720 100644 --- a/po/en.po +++ b/po/en.po @@ -1,12 +1,12 @@ # English messages for duff -# Copyright © 2011 Camilla Berglund +# Copyright © 2011 Camilla Löwy msgid "" msgstr "" "Project-Id-Version: duff 0.5.2\n" "Report-Msgid-Bugs-To: dreda@dreda.org\n" "POT-Creation-Date: 2013-07-23 15:52+0200\n" "PO-Revision-Date: \n" -"Last-Translator: Camilla Berglund \n" +"Last-Translator: Camilla Löwy \n" "Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" @@ -15,8 +15,8 @@ msgstr "" #: src/duff.c:153 #, c-format -msgid "Copyright (c) 2005 Camilla Berglund \n" -msgstr "Copyright (c) 2005 Camilla Berglund \n" +msgid "Copyright (c) 2005 Camilla Löwy \n" +msgstr "Copyright (c) 2005 Camilla Löwy \n" #: src/duff.c:154 #, c-format diff --git a/po/sv.po b/po/sv.po index 9665b56..c34b27a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,12 +1,12 @@ # Swedish messages for duff -# Copyright © 2011 Camilla Berglund +# Copyright © 2011 Camilla Löwy msgid "" msgstr "" "Project-Id-Version: duff 0.5.2\n" "Report-Msgid-Bugs-To: dreda@dreda.org\n" "POT-Creation-Date: 2013-07-23 15:52+0200\n" "PO-Revision-Date: 2011-04-11 18:11+0100\n" -"Last-Translator: Camilla Berglund \n" +"Last-Translator: Camilla Löwy \n" "Language-Team: \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -15,8 +15,8 @@ msgstr "" #: src/duff.c:153 #, c-format -msgid "Copyright (c) 2005 Camilla Berglund \n" -msgstr "Copyright (c) 2005 Camilla Berglund \n" +msgid "Copyright (c) 2005 Camilla Löwy \n" +msgstr "Copyright (c) 2005 Camilla Löwy \n" #: src/duff.c:154 #, c-format diff --git a/src/duff.c b/src/duff.c index ae0fc50..b23de42 100644 --- a/src/duff.c +++ b/src/duff.c @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any @@ -150,7 +150,7 @@ static void bugs(void); static void version(void) { printf("%s\n", PACKAGE_STRING); - printf(_("Copyright (c) 2005 Camilla Berglund \n")); + printf(_("Copyright (c) 2005 Camilla Löwy \n")); printf(_("%s contains shaX-asaddi\n"), PACKAGE_NAME); printf(_("Copyright (c) 2001-2003 Allan Saddi \n")); } diff --git a/src/duff.h b/src/duff.h index 9ebdc63..0e3542d 100644 --- a/src/duff.h +++ b/src/duff.h @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any diff --git a/src/duffdriver.c b/src/duffdriver.c index 6a34db0..b17cd5b 100644 --- a/src/duffdriver.c +++ b/src/duffdriver.c @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any diff --git a/src/dufffile.c b/src/dufffile.c index bbda0b8..8ee0589 100644 --- a/src/dufffile.c +++ b/src/dufffile.c @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any diff --git a/src/duffstring.c b/src/duffstring.c index 18c42ec..701ffc2 100644 --- a/src/duffstring.c +++ b/src/duffstring.c @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any diff --git a/src/duffstring.h b/src/duffstring.h index c2298a9..dc834f9 100644 --- a/src/duffstring.h +++ b/src/duffstring.h @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any diff --git a/src/duffutil.c b/src/duffutil.c index 20f3a31..20ccf3f 100644 --- a/src/duffutil.c +++ b/src/duffutil.c @@ -1,6 +1,6 @@ /* * duff - Duplicate file finder - * Copyright (c) 2005 Camilla Berglund + * Copyright (c) 2005 Camilla Löwy * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any