diff options
author | Luke Shumaker <luke@HP-dv6426us-u904.(none)> | 2009-10-24 02:29:05 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-26 00:30:16 -0600 |
commit | 9a23c9f512f04ef3dcbb715e2dccb7a9b8b3036a (patch) | |
tree | c0375eb00d9798a5f15d8093ab50dd7620c9dc86 /diff | |
parent | acc687b3a74e3c8d750630c323d223f1c63599db (diff) |
managing the whole thing with GIT now
Diffstat (limited to 'diff')
61 files changed, 774 insertions, 0 deletions
diff --git a/diff/.bzr/README b/diff/.bzr/README new file mode 100644 index 0000000..4f8e767 --- /dev/null +++ b/diff/.bzr/README @@ -0,0 +1,3 @@ +This is a Bazaar control directory. +Do not change any files in this directory. +See http://bazaar-vcs.org/ for more information about Bazaar. diff --git a/diff/.bzr/branch-format b/diff/.bzr/branch-format new file mode 100644 index 0000000..9eb09b7 --- /dev/null +++ b/diff/.bzr/branch-format @@ -0,0 +1 @@ +Bazaar-NG meta directory, format 1 diff --git a/diff/.bzr/branch/branch.conf b/diff/.bzr/branch/branch.conf new file mode 100644 index 0000000..b9ac50a --- /dev/null +++ b/diff/.bzr/branch/branch.conf @@ -0,0 +1,2 @@ +bound_location = file:///home/luke/Development/abomination/diff/ +bound = True diff --git a/diff/.bzr/branch/format b/diff/.bzr/branch/format new file mode 100644 index 0000000..1fc6b88 --- /dev/null +++ b/diff/.bzr/branch/format @@ -0,0 +1 @@ +Bazaar Branch Format 6 (bzr 0.15) diff --git a/diff/.bzr/branch/last-revision b/diff/.bzr/branch/last-revision new file mode 100644 index 0000000..58c3a79 --- /dev/null +++ b/diff/.bzr/branch/last-revision @@ -0,0 +1 @@ +13 lukeshu@sbcglobal.net-20090807202925-l5z2jc0b56o76sq6 diff --git a/diff/.bzr/branch/tags b/diff/.bzr/branch/tags new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/diff/.bzr/branch/tags diff --git a/diff/.bzr/checkout/conflicts b/diff/.bzr/checkout/conflicts new file mode 100644 index 0000000..0dc2d3a --- /dev/null +++ b/diff/.bzr/checkout/conflicts @@ -0,0 +1 @@ +BZR conflict list format 1 diff --git a/diff/.bzr/checkout/dirstate b/diff/.bzr/checkout/dirstate Binary files differnew file mode 100644 index 0000000..1ee2b41 --- /dev/null +++ b/diff/.bzr/checkout/dirstate diff --git a/diff/.bzr/checkout/format b/diff/.bzr/checkout/format new file mode 100644 index 0000000..9ffb5e4 --- /dev/null +++ b/diff/.bzr/checkout/format @@ -0,0 +1 @@ +Bazaar Working Tree Format 4 (bzr 0.15) diff --git a/diff/.bzr/repository/format b/diff/.bzr/repository/format new file mode 100644 index 0000000..520349d --- /dev/null +++ b/diff/.bzr/repository/format @@ -0,0 +1 @@ +Bazaar pack repository format 1 (needs bzr 0.92) diff --git a/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.iix b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.iix Binary files differnew file mode 100644 index 0000000..aa601a5 --- /dev/null +++ b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.iix diff --git a/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.rix b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.rix Binary files differnew file mode 100644 index 0000000..21dd3b9 --- /dev/null +++ b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.rix diff --git a/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.six b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.tix b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.tix Binary files differnew file mode 100644 index 0000000..eeb942f --- /dev/null +++ b/diff/.bzr/repository/indices/460eb9d2718188684f5db460da266ae5.tix diff --git a/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.iix b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.iix Binary files differnew file mode 100644 index 0000000..92e642d --- /dev/null +++ b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.iix diff --git a/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.rix b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.rix Binary files differnew file mode 100644 index 0000000..6afbf19 --- /dev/null +++ b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.rix diff --git a/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.six b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.tix b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.tix Binary files differnew file mode 100644 index 0000000..24a34d7 --- /dev/null +++ b/diff/.bzr/repository/indices/5fb3e8a43c6057c525436d0a9ee34dfa.tix diff --git a/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.iix b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.iix Binary files differnew file mode 100644 index 0000000..783765e --- /dev/null +++ b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.iix diff --git a/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.rix b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.rix Binary files differnew file mode 100644 index 0000000..dd59ac7 --- /dev/null +++ b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.rix diff --git a/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.six b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.tix b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.tix Binary files differnew file mode 100644 index 0000000..e47c7b8 --- /dev/null +++ b/diff/.bzr/repository/indices/702a8e40bea818fdcbdb08d1a8619382.tix diff --git a/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.iix b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.iix Binary files differnew file mode 100644 index 0000000..ad9cb1e --- /dev/null +++ b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.iix diff --git a/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.rix b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.rix Binary files differnew file mode 100644 index 0000000..a8a275d --- /dev/null +++ b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.rix diff --git a/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.six b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.tix b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.tix Binary files differnew file mode 100644 index 0000000..19d533f --- /dev/null +++ b/diff/.bzr/repository/indices/de98138f38491b0c84994755ad2c1c41.tix diff --git a/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.iix b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.iix Binary files differnew file mode 100644 index 0000000..2e9aea7 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.iix diff --git a/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.pack b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.pack Binary files differnew file mode 100644 index 0000000..22a7cbd --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.pack diff --git a/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.rix b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.rix Binary files differnew file mode 100644 index 0000000..24f543c --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.rix diff --git a/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.six b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.tix b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.tix Binary files differnew file mode 100644 index 0000000..07a5c3a --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/25116d0ab444b34c7b9724e11b4c2345.tix diff --git a/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.iix b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.iix Binary files differnew file mode 100644 index 0000000..7b66e64 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.iix diff --git a/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.pack b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.pack Binary files differnew file mode 100644 index 0000000..fa48f44 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.pack diff --git a/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.rix b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.rix Binary files differnew file mode 100644 index 0000000..fc4a2c9 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.rix diff --git a/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.six b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.tix b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.tix Binary files differnew file mode 100644 index 0000000..c1ea9e5 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/31ed7448b24a3dcdac128cc7a95fda44.tix diff --git a/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.iix b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.iix Binary files differnew file mode 100644 index 0000000..1026e55 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.iix diff --git a/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.pack b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.pack Binary files differnew file mode 100644 index 0000000..c41a1b2 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.pack diff --git a/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.rix b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.rix Binary files differnew file mode 100644 index 0000000..9420721 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.rix diff --git a/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.six b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.tix b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.tix Binary files differnew file mode 100644 index 0000000..35722ef --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/3c629ee7ff2d828705c9a07b054ffd35.tix diff --git a/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.iix b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.iix Binary files differnew file mode 100644 index 0000000..c3c2983 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.iix diff --git a/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.pack b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.pack Binary files differnew file mode 100644 index 0000000..13d5ec4 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.pack diff --git a/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.rix b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.rix Binary files differnew file mode 100644 index 0000000..8cda366 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.rix diff --git a/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.six b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.tix b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.tix Binary files differnew file mode 100644 index 0000000..a214111 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/5c4c13f5bb7c98a25eb77a3bf979f0bb.tix diff --git a/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.iix b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.iix Binary files differnew file mode 100644 index 0000000..20bc5cd --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.iix diff --git a/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.pack b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.pack Binary files differnew file mode 100644 index 0000000..57e853a --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.pack diff --git a/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.rix b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.rix Binary files differnew file mode 100644 index 0000000..509f2c5 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.rix diff --git a/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.six b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.six new file mode 100644 index 0000000..1206f93 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.tix b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.tix Binary files differnew file mode 100644 index 0000000..e3f4973 --- /dev/null +++ b/diff/.bzr/repository/obsolete_packs/c2d94537bd2fddfbc7ca45c0e47a66df.tix diff --git a/diff/.bzr/repository/pack-names b/diff/.bzr/repository/pack-names Binary files differnew file mode 100644 index 0000000..fecfd61 --- /dev/null +++ b/diff/.bzr/repository/pack-names diff --git a/diff/.bzr/repository/packs/460eb9d2718188684f5db460da266ae5.pack b/diff/.bzr/repository/packs/460eb9d2718188684f5db460da266ae5.pack Binary files differnew file mode 100644 index 0000000..102f811 --- /dev/null +++ b/diff/.bzr/repository/packs/460eb9d2718188684f5db460da266ae5.pack diff --git a/diff/.bzr/repository/packs/5fb3e8a43c6057c525436d0a9ee34dfa.pack b/diff/.bzr/repository/packs/5fb3e8a43c6057c525436d0a9ee34dfa.pack Binary files differnew file mode 100644 index 0000000..6c338e5 --- /dev/null +++ b/diff/.bzr/repository/packs/5fb3e8a43c6057c525436d0a9ee34dfa.pack diff --git a/diff/.bzr/repository/packs/702a8e40bea818fdcbdb08d1a8619382.pack b/diff/.bzr/repository/packs/702a8e40bea818fdcbdb08d1a8619382.pack Binary files differnew file mode 100644 index 0000000..fa9f03f --- /dev/null +++ b/diff/.bzr/repository/packs/702a8e40bea818fdcbdb08d1a8619382.pack diff --git a/diff/.bzr/repository/packs/de98138f38491b0c84994755ad2c1c41.pack b/diff/.bzr/repository/packs/de98138f38491b0c84994755ad2c1c41.pack Binary files differnew file mode 100644 index 0000000..9faf67f --- /dev/null +++ b/diff/.bzr/repository/packs/de98138f38491b0c84994755ad2c1c41.pack diff --git a/diff/COPYING b/diff/COPYING new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/diff/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/diff/Makefile.in b/diff/Makefile.in new file mode 100644 index 0000000..ebd5f5f --- /dev/null +++ b/diff/Makefile.in @@ -0,0 +1,90 @@ +#!/usr/bin/make -f +name = diff-daemon +ver = 1.0 +# Copyright (C) 2009 Luke Shumaker +# +# This file is part of diff-daemon. +# +# diff-daemon is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2, or (at your option) any later version. +# +# diff-daemon is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with diff-daemon; see the file COPYING. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Directories ###################################################### +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +sbindir = @sbindir@ +dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) + +# Programs ######################################################### +SHELL = @SHELL@ +RM = rm -f +SED = sed +INSTALL = install +MKDIR = $(INSTALL) -d #mkdir -p +INSTALL_PROGRAM = $(INSTALL) +INSTALL_DATA = $(INSTALL) -m 644 + +# phony targets #################################################### +all : diff-daemon patch-daemon +.PHONY : install uninstall clean distclean dist +.SUFFIXES : + +# install ########################################################## + +install : install-diff-daemon install-patch-daemon + +install-diff-daemon : diff-daemon + $(INSTALL_PROGRAM) $< $(bindir)/$< +install-patch-daemon : patch-daemon + $(INSTALL_PROGRAM) $< $(bindir)/$< + +# uninstall ######################################################## + +uninstall : uninstall-diff-daemon uninstall-patch-daemon + +uninstall-diff-daemon : + $(rm) $(bindir)/diff-daemon +uninstall-patch-daemon : + $(rm) $(bindir)/patch-daemon + +# clean ############################################################ + +clean : + +distclean : clean + $(RM) Makefile + $(RM) diff-daemon patch-daemon + +# dist ############################################################# + +d = $(name)-$(ver) +dist : $(d).tar.gz + +$(d).tar.gz : $(d) $(d)/COPYING $(d)/configure $(d)/diff-daemon.sh $(d)/patch-daemon.sh $(d)/Makefile.in + tar -czf $@ $< + +$(d) : + $(INSTALL) -m 777 -d $@ + +$(d)/% : $(srcdir)/% $(d) + cp $< $@ + +# implicit rules ################################################### + +$(dirs) : + $(MKDIR) $@ +% : $(srcdir)/%.sh + sed 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' < $< > $@ + diff --git a/diff/configure b/diff/configure new file mode 100755 index 0000000..b10667f --- /dev/null +++ b/diff/configure @@ -0,0 +1,93 @@ +#!/bin/sh +name='configure' # diff-daemon configureation script +#ver=1.0 +# Copyright (C) 2009 Luke Shumaker +# +# This file is part of diff-daemon. +# +# diff-daemon is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2, or (at your option) any later version. +# +# diff-daemon is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with diff-daemon; see the file COPYING. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + _SHELL='/bin/sh' + _prefix='/usr/local' +_exec_prefix='$(prefix)' + _bindir='$(exec_prefix)/bin' + _sbindir='$(exec_prefix)/sbin' + _srcdir=$(readlink -f `dirname "$0"`) + +vars='name SHELL prefix exec_prefix bindir sbindir srcdir' + +error() { + echo "$name: $1" >> /dev/stderr + exit 1 +} + +args=`getopt -n "$name" -o "${sopt}" -l "${lopt}${vars}" -- "$@"` +if [ $? == 0 ]; then + set -- $args + while [ $# -gt 0 ]; do case "$1" in + --) break;; + --*) + var0="${1/--/}" + match='false' + for var1 in $vars; do + if [ "$var0" == "$var1" ]; then + match='true' + break; + fi + done + if [ "$match" == 'true' ]; then + val="$2" + eval _$var0=$val + else + error "option \`$1' not recognized"; + fi + :;; + *) error "option \`$1' not recognized";; + esac + shift + done +else + error 'unable to parse command line arguments' +fi + +echo '#!/bin/sed -f' > var.sed +for var in $vars; do + var1="_$var" + val=${!var1} + + # GNU bash optimized version + #var=${var//':'/'\:'} + #val=${val//':'/'\:'} + # POSIX version + var=`echo "$var" | sed 's@:@\\:@g'` + val=`echo "$val" | sed 's@:@\\:@g'` + + echo "s:@$var@:$val:g" >> var.sed +done + +echo "11 a# DO NOT edit this file, it has been generated by configure, and will +11 a# be overwritten. Instead, edit the file \`Makefile.in'" >> var.sed + +Makefiles=`find "${_srcdir}/" -regextype posix-extended \ +-regex '(.*/)?Makefile\.in' -type f` + +for orig in $Makefiles; do + new=${orig/%.in/} + new=${new/#$_srcdir\//} + mkdir -p `dirname "$new"` + sed -f var.sed < "${orig}" > "${new}" +done +rm var.sed + diff --git a/diff/diff-daemon.sh b/diff/diff-daemon.sh new file mode 100644 index 0000000..daa258d --- /dev/null +++ b/diff/diff-daemon.sh @@ -0,0 +1,156 @@ +#!/bin/sh +name='diff-daemon' +ver=1.1 +# Copyright (C) 2009 Luke Shumaker +# +# This file is part of diff-daemon. +# +# diff-daemon is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2, or (at your option) any later version. +# +# diff-daemon is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with diff-daemon; see the file COPYING. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# count the number of times the char "$1" occurs in string "$2" +# note that the string can't contain any newlines. +chCount() { + char=$1 + string="$2" + echo "$string" | tr ':' '\n' | wc -l + # this returns the correct answer+1 + # this is OK for now, because it is only used for inequality +} + +l_common() { + # If they're the same, just echo one of them + if [ "$1" = "$2" ]; then + str="$1" + else + # it will be faster if the string with fewer #s is first + if [ "`chCount ':' "$1"`" -lt "`chCount ':' "$2"`" ]; then + a0="$1" + a1="$2" + else + a0="$2" + a1="$1" + fi + str='' + #for int in ${a0//:/: }; do # bash optimized version + for int in `echo "$a0" | tr ':' ' '`; do + str="$str`echo ":$a1" | sed -n "s/.*:\($int:\).*/\1/p"`" + done + fi + echo "$str" +} + +l_add() { + str='' + #for int in ${1//:/: }; do # bash optimized version + for int in `echo "$1" | tr ':' ' '`; do + str="$str`expr "$int" + "$2"`:" + done + echo "$str" +} + +# add a new line with contents $1 +print_new() { + echo "n$1" +} + +# insert $1 blank lines +# if $1 is not defined, default to 1 +print_blank() { + echo "b${1-1}" +} + +print_copy() { + if [ -n "$m1" ]; then + m1="`echo "$m1" | sed 's/:.*//'`" + if [ "$mi" = '0' ]; then + mp="${m1}" + else + m0="`expr $m1 - $mi`" + mp="$m0,$m1" + fi + if [ -z "`sed -n "$mp p" "$file0"`" ]; then + print_blank "`expr 1 + $m1 - $m0`" + else + echo "c$mp" + fi + fi +} + +print_uniq() { + if [ -n "$line" ]; then + print_new "$line" + else + print_blank + fi +} + +matches() { + grep -n "^$line$" "$file0" | cut -d ':' -f 1 | tr '\n' ':' +} + +# main loop + +file0="$1" +file1="$2" + +i='1' +c=`wc -l "$file1" | cut -d ' ' -f 1` +while [ "$i" -le "$c" ]; do + line="`sed -n "$i p" "$file1"`" + + # it should be simpler to count the `:'s in $m1 + ms="`echo "$m1" | sed 's/:.*//'`" + #echo "ms=$ms" + if [ -n "$m1" ] && [ "$m1" = "$ms:" ]; then + #echo "yay $ms" + ret1="`expr $ms + 1`" + if [ "$line" = "`sed -n "$ret1 p" "$file0"`" ]; then + m1="$ret1:" + mi=`expr "$mi" + 1` + else + print_copy + m1="`matches`" + if [ -n "$m1" ]; then + # start new trend + mi='0' + else + print_uniq + fi + fi + else + matches="`matches`" + if [ -n "$matches" ]; then + ret1=`l_common "$matches" "$(l_add "$m1" '1')"` + if [ -n "$ret1" ]; then + # continue trend + m1="$ret1" + mi=`expr "$mi" + 1` + else + # start new trend + print_copy + m1="$matches" + mi='0' + fi + else + print_copy + m1='' + print_uniq + fi + fi + + i=`expr $i + 1` +done +print_copy + diff --git a/diff/patch-daemon.sh b/diff/patch-daemon.sh new file mode 100644 index 0000000..0c4530f --- /dev/null +++ b/diff/patch-daemon.sh @@ -0,0 +1,39 @@ +#!/bin/sh +name='patch-daemon' +ver='1.0' +# Copyright (C) 2009 Luke Shumaker +# +# This file is part of diff-daemon. +# +# diff-daemon is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2, or (at your option) any later version. +# +# diff-daemon is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with diff-daemon; see the file COPYING +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +file="${1}" +diff="${2-/dev/stdin}" + +while read line; do + com="`echo "$line" | sed 's/^\(.\).*$/\1/'`" + arg="`echo "$line" | sed "s/^$com//"`" + case "$com" in + n) echo "$arg";; + b) + i='0'; while [ "$i" -lt "$arg" ]; do + echo '' + i=`expr $i + 1` + done + :;; + c) sed -n "$arg p" "$file";; + esac +done < "$diff" + |