Rename ldcc -> rdcc, ltcp -> rtcp.

diff --git a/dcc/Makefile.am b/dcc/Makefile.am
index fb8fab0..7af251a 100644 (file)
--- a/dcc/Makefile.am
+++ b/dcc/Makefile.am
@@ -1,14 +1,14 @@
 DEFS = -I$(srcdir) -I$(top_srcdir) $(CFLAGS) @DEFS@
 LIBOBJS = @LIBOBJS@
 EXTRA_DIST = basename.c getopt.c getopt.h getopt1.c
-CLEANFILES = ldcc ltcp
+CLEANFILES = rdcc rtcp
 
-bin_PROGRAMS = ldcc ltcp
+bin_PROGRAMS = rdcc rtcp
 
-ltcp_SOURCES = tcp.c
-ltcp_LDADD = $(LIBOBJS)
-ldcc_SOURCES = dcc.c
-ldcc_LDADD = $(LIBOBJS)
+rtcp_SOURCES = tcp.c
+rtcp_LDADD = $(LIBOBJS)
+rdcc_SOURCES = dcc.c
+rdcc_LDADD = $(LIBOBJS)
 
 package: all
 install-package: package install

diff --git a/dcc/dcc.c b/dcc/dcc.c
index cd0ccd6..fc2c4fd 100644 (file)
--- a/dcc/dcc.c
+++ b/dcc/dcc.c
@@ -1,7 +1,7 @@
 /* dcc.c
- * Copyright (C) 1998-2002  Daiki Ueno
+ * Copyright (C) 1998-2003  Daiki Ueno
  *
- * This file is part of Liece.
+ * This file is part of Riece.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -75,24 +75,26 @@ static u_long get_address_externally();
 static char *progname;
 
 void version () {
-       printf("%s (Liece) 1.4.0\n"
-                                "Copyright (C) 1998, 1999 Daiki Ueno\n"
-                                "This is free software; see the source for copying conditions.  There is NO\n"
-                                "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 
-                                progname);
+       fprintf(stderr,
+                                       "%s (%s) %s\n"
+                                       "Copyright (C) 1998-2003 Daiki Ueno\n"
+                                       "This is free software; see the source for copying conditions.  There is NO\n"
+                                       "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 
+                                       progname, PACKAGE, VERSION);
 }
 
-void usage() {
-  printf("Usage: %s [global-options] command [command-options-and-arguments]\n"
-                                "where global-options are -v, -h, etc.\n"
-                                "where command is one of send, receive, chat, resolve.\n"
-                                "where command-options-and-arguments depend on the specific command.\n\n"
-                                "send <host> <port> <filename>\n"
-                                "receive <host> <port> <size> <filename>\n"
-                                "chat listen <port>\n"
-                                "chat connect <host> <port>\n"
-                                "resolve [hosts ...]\n",
-                                progname);
+void usage () {
+  fprintf(stderr,
+                                       "Usage: %s [global-options] command [arguments...]\n"
+                                       "where global-options are -v, -h, etc.\n"
+                                       "where command is one of send, receive, chat, resolve.\n"
+                                       "where arguments depend on the specific command.\n\n"
+                                       "send <port> <filename>\n"
+                                       "receive <host> <port> <size> <filename>\n"
+                                       "chat listen <port>\n"
+                                       "chat connect <host> <port>\n"
+                                       "resolve [hosts ...]\n",
+                                       progname);
 }
 
 int prepare_listen_port (int ip_port) {
@@ -412,11 +414,11 @@ int main (int argc, char **argv) {
                switch (c) {
                case 'v':
                        version();
-                       exit(1);
+                       exit(0);
                        break;
                case 'h':
                        usage();
-                       exit(1);
+                       exit(0);
                        break;
                default:
                        break;

diff --git a/dcc/tcp.c b/dcc/tcp.c
index 8ed67fe..13e2c49 100644 (file)
--- a/dcc/tcp.c
+++ b/dcc/tcp.c
@@ -1,8 +1,8 @@
 /* tcp.c - TCP/IP stream emulation for GNU Emacs.
  * Copyright (C) 1988, 1989, 1992, 1993 Free Software Foundation, Inc.
- * Copyright (C) 1998-2002  Daiki Ueno
+ * Copyright (C) 1998-2003  Daiki Ueno
  *
- * This file is part of Liece.
+ * This file is part of Riece.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -55,15 +55,16 @@
 static char *progname;
 
 void version () {
-       printf("%s (Liece) 1.4.0\n"
-              "Copyright (C) 1998, 1999 Daiki Ueno\n"
-              "This is free software; see the source for copying conditions.  There is NO\n"
-              "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 
-              progname);
+  fprintf(stderr,
+         "%s (%s) %s\n"
+         "Copyright (C) 1998-2003 Daiki Ueno\n"
+         "This is free software; see the source for copying conditions.  There is NO\n"
+         "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 
+         progname, PACKAGE, VERSION);
 }
 
-void usage() {
-  printf("Usage: %s [options] host [service]\n", progname);
+void usage () {
+  fprintf(stderr, "Usage: %s [options] host [service]\n", progname);
 }
 
 \f
@@ -111,11 +112,11 @@ main (argc, argv)
        {
        case 'v':
          version ();
-         exit (1);
+         exit (0);
          break;
        case 'h':
          usage ();
-         exit (1);
+         exit (0);
          break;
        default:
          break;