add

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..b7b5f53
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+                   GNU GENERAL PUBLIC LICENSE
+                      Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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.
+\f
+                   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.)
+\f
+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.
+\f
+  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.
+\f
+  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
+\f
+           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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 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/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..1ffa16b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,27 @@
+BINS=isutf8
+PERLSCRIPTS=sponge vidir vipe ts
+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1
+CFLAGS=-O2 -g -Wall
+CXXFLAGS=-O2 -g -Wall
+
+all: $(BINS) $(MANS)
+
+clean:
+       rm -f $(BINS) $(MANS)
+
+install:
+       mkdir -p $(PREFIX)/usr/bin
+       install -s $(BINS) $(PREFIX)/usr/bin
+       install $(PERLSCRIPTS) $(PREFIX)/usr/bin
+       
+       mkdir -p $(PREFIX)/usr/share/man/man1
+       install $(MANS) $(PREFIX)/usr/share/man/man1
+
+check: isutf8
+       ./check-isutf8
+
+isutf8.1: isutf8.docbook
+       docbook2x-man isutf8.docbook
+
+%.1: %
+       pod2man --center=" " --release="moreutils" $< > $@;

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..7c4b6c5
--- /dev/null
+++ b/README
@@ -0,0 +1,18 @@
+This is a collection of the unix tools that nobody thought to write
+thirty years ago. If you have written a general purpose unix tool, feel
+free to contribute it for inclusion in this package.
+
+isutf8
+       check if a file or standard input is utf-8
+mime
+       determine MIME type of a file
+sponge
+       soak up standard input and write to a file
+ts
+       timestamp standard input
+vidir
+       edit a directory in your text editor
+vipe
+       edit a pipe using your text editor
+
+-- Joey Hess <joey@kitenet.net>

diff --git a/check-isutf8 b/check-isutf8
new file mode 100755 (executable)
index 0000000..92d3933
--- /dev/null
+++ b/check-isutf8
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Run checks for ./isutf8.
+#
+# Lars Wirzenius <liw@iki.fi>
+
+check() {
+    printf "$2" | ./isutf8 -q
+    ret=$?
+    if [ $ret != $1 ]
+    then
+        echo "Failure:"
+        echo "  input: $2"
+        echo "  expected: $1"
+        echo "  got: $ret"
+    fi
+}
+
+check 0 ''
+check 0 'a'
+check 0 'ab'
+check 0 '\xc2\xa9'
+
+check 1 '\xc2'
+check 1 '\xc2\x20'
+check 1 '\x20\xc2'

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..b6a1039
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+moreutils (0.1) unstable; urgency=low
+
+  * First release.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 12 Feb 2006 17:11:21 -0500

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..81396a3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,16 @@
+Source: moreutils
+Section: utils
+Priority: optional
+Build-Depends: debhelper (>= 4), dpkg-dev (>= 1.9.0), docbook2x
+Maintainer: Joey Hess <joeyh@debian.org>
+Standards-Version: 3.6.2
+
+Package: moreutils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Description: additional unix utilities
+ This is a collection of the unix tools that nobody thought to write
+ thirty years ago.
+ .
+ Includes the following utilities:
+ isutf8 sponge ts vidir vipe

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..4273bcb
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,32 @@
+This package was put together and debianized by Joey Hess
+<joeyh@debian.org>, using sources from all over.
+
+isutf8 and mime are Copyright (C) 2005  Lars Wirzenius, under terms of
+the GPL.
+
+sponge:
+
+# Copyright (C) 2003 Colin Watson <cjwatson@debian.org>.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Everything else is copyright 1999-2005 by Joey Hess, under the terms of GPL.
+The full text of the GNU GPL can be found in /usr/share/common-licenses/GPL
+on Debian systems.

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..63551fc
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+       dh_testdir
+       $(MAKE)
+       $(MAKE) check
+       touch build-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp
+       -$(MAKE) -i clean
+       dh_clean
+
+binary-indep: build
+
+binary-arch: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       $(MAKE) PREFIX=debian/moreutils install
+       dh_installdocs README
+       dh_installchangelogs
+       dh_perl
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)')
+
+# Update the web page. Not intended for use by anyone except the
+# author.
+DIR=/home/web/kitenet.net/programs/moreutils
+installhook:
+       cp debian/changelog $(DIR)/CHANGES
+       echo -n $(VERSION) > $(DIR)/LATEST-VERSION-IS
+       rm -f $(DIR)/*.tar.gz
+       ln -s /home/joey/lib/debian/unstable/moreutils_$(VERSION).tar.gz $(DIR)/moreutils-$(VERSION).tar.gz
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary

diff --git a/isutf8.c b/isutf8.c
new file mode 100644 (file)
index 0000000..88bb38b
--- /dev/null
+++ b/isutf8.c
@@ -0,0 +1,146 @@
+/*
+ * isutf8.c - do the input files look like valid utf-8 byte streams?
+ * 
+ * Copyright (C) 2005  Lars Wirzenius
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <getopt.h>
+
+#define VERSION "1.0"
+
+/* 
+ * I'm pretty sure there is a fancy trick to do this without a loop,
+ * but I'm too tired to figure it out now. --liw
+ */
+static int high_ones(int c)
+{
+    int n;
+
+    for (n = 0; (c & 0x80) == 0x80; c <<= 1)
+        ++n;    
+    return n;
+}
+
+static int is_utf8_byte_stream(FILE *file, char *filename, int quiet)
+{
+    int c, n, remaining_bytes;
+    unsigned long line, col;
+    
+    remaining_bytes = 0;
+    line = 1;
+    col = 1;
+    while ((c = getc(file)) != EOF) {
+        n = high_ones(c);
+        if (remaining_bytes > 0) {
+            if (n == 1) {
+                --remaining_bytes;
+                if (remaining_bytes == 0)
+                    ++col;
+            } else
+                goto error;
+        } else if (n == 0) {
+            /* 7-bit character, skip, but adjust position */
+            if (c == '\n') {
+                ++line;
+                col = 1;
+            } else
+                ++col;
+        } else if (n == 1)
+            goto error; /* wrong place for continuation byte */
+        else
+            remaining_bytes = n - 1; /* start of multi-byte sequence */
+    }
+    if (remaining_bytes > 0)
+        goto error;
+    return 1;
+    
+error:
+    if (!quiet) {
+        printf("%s: line %lu, col %lu: invalid UTF-8 code\n", 
+               filename, line, col);
+    }
+    return 0;
+}
+
+static void usage(const char *program_name)
+{
+    printf("Usage: %s [-hq] [--help] [--quiet] [file ...]\n", program_name);
+    printf("Check whether input files are valid UTF-8.\n");
+    printf("This is version %s.\n", VERSION);
+}
+
+int main(int argc, char **argv)
+{
+    int i, ok;
+    FILE *file;
+
+    int quiet;
+    struct option options[] = {
+        { "help", no_argument, NULL, 'h' },
+        { "quiet", no_argument, &quiet, 1 },
+    };
+    int opt;
+    
+    quiet = 0;
+    
+    while ((opt = getopt_long(argc, argv, "hq", options, NULL)) != -1) {
+        switch (opt) {
+        case 0:
+            break;
+            
+        case 'h':
+            usage(argv[0]);
+            exit(0);
+            break;
+            
+        case 'q':
+            quiet = 1;
+            break;
+
+        case '?':
+            exit(EXIT_FAILURE);
+
+        default:
+            abort();
+        }
+    }
+
+    if (optind == argc)
+        ok = is_utf8_byte_stream(stdin, "stdin", quiet);
+    else {
+        ok = 1;
+        for (i = optind; i < argc; ++i) {
+            file = fopen(argv[i], "r");
+            if (file == NULL) {
+                fprintf(stderr, "isutf8: %s: error %d: %s\n", 
+                        argv[i], errno, strerror(errno));
+                ok = 0;
+            } else {
+                ok = is_utf8_byte_stream(file, argv[i], quiet) && ok;
+                (void) fclose(file);
+            }
+        }
+    }
+    
+    if (ok)
+        exit(0);
+    exit(EXIT_FAILURE);
+}

diff --git a/isutf8.docbook b/isutf8.docbook
new file mode 100644 (file)
index 0000000..ef8ef9d
--- /dev/null
+++ b/isutf8.docbook
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+
+Copyright 2006 Lars Wirzenius (liw@iki.fi)
+
+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
+
+-->
+
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
+[]>
+
+<refentry>
+
+  <refentryinfo>
+    <address>
+      <email>liw@iki.fi</email>
+    </address>
+    <author>
+      <firstname>Lars</firstname>
+      <surname>Wirzenius</surname>
+    </author>
+    <date>2006-02-19</date>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>isutf8</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>isutf8</refname> 
+    <refpurpose>check whether files are valid UTF-8</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>isutf8</command>
+      <arg><option>-hq</option></arg>
+      <arg><option>--help</option></arg>
+      <arg><option>--quiet</option></arg>
+      <group choice="opt">
+          <arg rep="repeat"><replaceable>file</replaceable></arg>
+      </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  
+  <refsect1>
+    <title>DESCRIPTION</title>
+    
+    <para><command>isutf8</command> checks whether files are
+    syntactically valid UTF-8. Input is either files named on the
+    command line, or the standard input. Notices about files with
+    invalid UTF-8 are printed to standard output.</para>
+    
+  </refsect1>
+  
+  <refsect1>
+    <title>OPTIONS</title>
+    
+    <variablelist>
+    
+        <varlistentry>
+            <term><option>-h</option></term>
+            <term><option>--help</option></term>
+            <listitem>
+                <para>Print out a help summary.</para>
+            </listitem>
+        </varlistentry>
+    
+        <varlistentry>
+            <term><option>-q</option></term>
+            <term><option>--quiet</option></term>
+            <listitem>
+                <para>Don't print messages telling which files are
+                invalid UTF-8, merely indicate it with the exit
+                status.</para>
+            </listitem>
+        </varlistentry>
+    
+    </variablelist>
+    
+  </refsect1>
+  
+  <refsect1>
+    <title>EXIT STATUS</title>
+    
+    <para>If the file is valid UTF-8, the exit status is zero. If the
+    file is not valid UTF-8, or there is some error, the exit status is
+    non-zero.</para>
+    
+  </refsect1>
+  
+  <refsect1>
+    <title>SEE ALSO</title>
+    
+    <para>
+        <citerefentry>
+            <refentrytitle>utf8</refentrytitle><manvolnum>7</manvolnum>
+        </citerefentry>
+    </para>
+    
+  </refsect1>
+
+</refentry>

diff --git a/sponge b/sponge
new file mode 100755 (executable)
index 0000000..324970b
--- /dev/null
+++ b/sponge
@@ -0,0 +1,54 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+sponge - soak up standard input and write to a file
+
+=head1 SYNOPSIS
+
+sed '...' file | grep '...' | sponge file
+
+=head1 DESCRIPTION
+
+sponge reads standard input and writes it out to the specified file.
+Unlike a shell redirect, sponge soaks up all its input before opening the
+output file. This allows for constructing pipelines that read from and write
+to the same file.
+
+=head1 AUTHOR
+
+Colin Watson <cjwatson@debian.org>
+
+=cut
+
+use warnings;
+use strict;
+
+# Copyright (C) 2003 Colin Watson <cjwatson@debian.org>.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+my $file=shift || die "usage: sponge file\n";
+binmode STDIN;
+undef $/;
+my $input = <STDIN>;
+open OUT, ">$file" or die "couldn't open $file: $!";
+print OUT $input or die "couldn't write to $file: $!";
+close OUT or die "couldn't close $file: $!";

diff --git a/ts b/ts
new file mode 100755 (executable)
index 0000000..42a1ce4
--- /dev/null
+++ b/ts
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+ts - timestamp input
+
+=head1 SYNOPSIS
+
+ts [format]
+
+=head1 DESCRIPTION
+
+ts adds a timestamp to the beginning of each line of input
+
+The optional format parameter controls how the timestamp is formatted,
+as used by L<strftime(3)>. The default format is "%H:%M:%S".
+
+=head1 AUTHOR
+
+Copyright 2006 by Joey Hess <joey@kitenet.net>
+
+Licensed under the GNU GPL.
+
+=cut
+
+use warnings;
+use strict;
+use POSIX q{strftime};
+
+my $format="%H:%M:%S";
+$format=shift if @ARGV;
+
+$|=1;
+
+while (<>) {
+       print strftime($format, localtime)." ".$_;
+}

diff --git a/vidir b/vidir
new file mode 100755 (executable)
index 0000000..7082162
--- /dev/null
+++ b/vidir
@@ -0,0 +1,176 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+vidir - edit directory
+
+=head1 SYNOPSIS
+
+B<vidir> [--verbose] [directory|file|-] ...
+
+=head1 DESCRIPTION
+
+vidir allows editing of the contents of a directory in a text editor. If no
+directory is specified, the current directory is edited. Each item in the
+directory is listed. Delete items to remove them from the directory, or
+edit their names to rename them.
+
+Note that if "-" is specified as the directory to edit, it reads a list of
+filenames from stdin and displays those for editing. Alternatively, a list
+of files can be specified on the command line.
+
+=head1 OPTIONS
+
+=over 4
+
+=item -v, --verbose
+
+Verbosely display the actions taken by the program.
+
+=back
+
+=head1 ENVIRONMENT VARIABLES
+
+=over 4
+
+=item EDITOR
+
+Editor to use. Defaults to vi if not set.
+
+=item VISUAL
+
+Also supported to determine what editor to use.
+
+=back
+
+=head1 BUGS
+
+Does not support deletion of directories. Does not support recursive
+editing of contents of a directory.
+
+=head1 AUTHOR
+
+Copyright 2006 by Joey Hess <joey@kitenet.net>
+
+Licensed under the GNU GPL.
+
+=cut
+
+use File::Temp;
+use Getopt::Long;
+
+my $error=0;
+
+my $verbose=0;
+if (! GetOptions("verbose|v" => \$verbose)) {
+       die "Usage: $0 [--verbose] [directory|file|-]\n";
+}
+
+my @dir;
+if (! @ARGV) {
+       push @ARGV, "."
+}
+foreach my $item (@ARGV) {
+       if ($item eq "-") {
+               push @dir, map { chomp; $_ } <STDIN>;
+               close STDIN;
+               open(STDIN, "/dev/tty") || die "reopen: $!\n";
+       }
+       elsif (-d $item) {
+               opendir(DIR, $item) || die "$0: cannot read $item: $!\n";
+               push @dir, sort readdir(DIR);
+               closedir DIR;
+       }
+       else {
+               push @dir, $item;
+       }
+}
+       
+my $tmp=File::Temp->new(template => "dirXXXXX");
+open (OUT, ">".$tmp->filename) || die "$0: cannot write ".$tmp->filename.": $!\n";
+
+my %item;
+my $c=0;
+foreach (@dir) {
+       next if $_ eq '.' || $_ eq '..';
+       $item{++$c}=$_;
+       print OUT "$c.\t$_\n";
+}
+@dir=();
+close OUT;
+
+my $editor="vi";
+if (exists $ENV{EDITOR}) {
+       $editor=$ENV{EDITOR};
+}
+if (exists $ENV{VISUAL}) {
+       $editor=$ENV{VISUAL};
+}
+$ret=system($editor, $tmp);
+if ($ret != 0) {
+       die "$editor exited nonzero, aborting\n";
+}
+
+open (IN, $tmp->filename) || die "$0: cannot read ".$tmp->filename.": $!\n";
+while (<IN>) {
+       chomp;
+       if (/^(\d+)\.\t(.*)/) {
+               my $num=$1;
+               my $name=$2;
+               if (! exists $item{$num}) {
+                       print STDERR "$0: unknown item number $num\n";
+                       $error=1;
+               }
+               elsif ($name ne $item{$num}) {
+                       my $src=$item{$num};
+                       
+                       # deal with swaps
+                       if (-e $name || -l $name) {
+                               my $tmp=$name."~";
+                               my $c=0;
+                               while (-e $tmp || -l $tmp) {
+                                       $c++;
+                                       $tmp=$name."~$c";
+                               }
+                               if (! rename($name, $tmp)) {
+                                       print STDERR "$0: failed to rename $name to $tmp: $!\n";
+                                       $error=1;
+                               }
+                               elsif ($verbose) {
+                                       print "'$name' -> '$tmp'\n";
+                               }
+                               foreach my $item (keys %item) {
+                                       if ($item{$item} eq $name) {
+                                               $item{$item}=$tmp;
+                                       }
+                               }
+                       }
+
+                       if (! rename($src, $name)) {
+                               print STDERR "$0: failed to rename $src to $name: $!\n";
+                               $error=1;
+                       }
+                       elsif ($verbose) {
+                               print "'$src' -> '$name'\n";
+                       }
+               }
+               delete $item{$num};
+       }
+       else {
+               die "$0: unable to parse line \"$_\", aborting\n";
+       }
+}
+close IN;
+unlink($tmp.'~') if -e $tmp.'~';
+
+foreach my $item (sort values %item) {
+       if (! unlink($item)) {
+               print STDERR "$0: failed to remove $item: $!\n";
+               $error=1;
+       }
+       if ($verbose) {
+               print "removed '$item'\n";
+       }
+}
+
+exit $error;

diff --git a/vipe b/vipe
new file mode 100755 (executable)
index 0000000..cbcffd8
--- /dev/null
+++ b/vipe
@@ -0,0 +1,69 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+vipe - edit pipe
+
+=head1 SYNOPSIS
+
+command | vipe | command
+
+=head1 DESCRIPTION
+
+vipe allows you to run your editor in the middle of a unix pipeline and
+edit the data that is being piped between programs.
+
+=head1 ENVIRONMENT VARIABLES
+
+=over 4
+
+=item EDITOR
+
+Editor to use. Defaults to vi if not set.
+
+=item VISUAL
+
+Also supported to determine what editor to use.
+
+=back
+
+=head1 AUTHOR
+
+Copyright 2006 by Joey Hess <joey@kitenet.net>
+
+Licensed under the GNU GPL.
+
+=cut
+
+use warnings;
+use strict;
+use File::Temp q{tempfile};
+
+$/=undef;
+
+my ($fh, $tmp)=tempfile();
+die "cannot create tempfile" unless $fh;
+print $fh <STDIN> || die "write temp: $!";
+close $fh;
+close STDIN;
+open(STDIN, "</dev/tty") || die "reopen stdin: $!";
+open(OUT, ">&STDOUT") || die "save stdout: $!";
+close STDOUT;
+open(STDOUT, ">/dev/tty") || die "reopen stdout: $!";
+
+my $editor="vi";
+if (exists $ENV{EDITOR}) {
+       $editor=$ENV{EDITOR};
+}
+if (exists $ENV{VISUAL}) {
+       $editor=$ENV{VISUAL};
+}
+my $ret=system($editor, $tmp);
+if ($ret != 0) {
+       die "$editor exited nonzero, aborting\n";
+}
+
+open (IN, $tmp) || die "$0: cannot read $tmp: $!\n";
+print OUT <IN> || die "write failure: $!";
+close IN;
+unlink($tmp);