Changeset 3237

Timestamp:

10/31/05 00:01:58 (3 years ago)

Author:

morris

Message:

Move to new libzanka interface

Fixes #63
Touches on #1, #62

Files:

• wire/trunk/Makefile.in (modified) (2 diffs)
• wire/trunk/config.h.in (modified) (1 diff)
• wire/trunk/configure (modified) (14 diffs)
• wire/trunk/configure.in (modified) (4 diffs)
• wire/trunk/man/wire.1 (modified) (4 diffs)
• wire/trunk/wire/Makefile.in (modified) (1 diff)
• wire/trunk/wire/client.c (modified) (34 diffs)
• wire/trunk/wire/client.h (modified) (3 diffs)
• wire/trunk/wire/commands.c (modified) (65 diffs)
• wire/trunk/wire/commands.h (modified) (2 diffs)
• wire/trunk/wire/files.c (modified) (6 diffs)
• wire/trunk/wire/files.h (modified) (3 diffs)
• wire/trunk/wire/ignores.c (modified) (9 diffs)
• wire/trunk/wire/ignores.h (modified) (1 diff)
• wire/trunk/wire/main.c (modified) (12 diffs)
• wire/trunk/wire/main.h (modified) (3 diffs)
• wire/trunk/wire/terminal.c (moved) (moved from wire/trunk/wire/term.c) (21 diffs)
• wire/trunk/wire/terminal.h (moved) (moved from wire/trunk/wire/term.h) (2 diffs)
• wire/trunk/wire/transfers.c (modified) (8 diffs)
• wire/trunk/wire/transfers.h (modified) (2 diffs)
• wire/trunk/wire/users.c (modified) (7 diffs)
• wire/trunk/wire/users.h (modified) (2 diffs)
• wire/trunk/wire/version.c (modified) (1 diff)
• wire/trunk/wire/version.h (modified) (1 diff)
• wire/trunk/wire/windows.c (modified) (24 diffs)
• wire/trunk/wire/windows.h (modified) (9 diffs)

wire/trunk/Makefile.in

@@ -20 +20 @@
-                target=`echo $@ | sed s/-recursive//`; \
-                echo "Making $$target in $$subdir"; \
-
+ || exit 1
-        done
-
@@ -58 +58 @@
-        rm -rf wire-$(WR_VERSION)
-
+auto: autoconf autoheader autoclean
+        
+autoconf:
+        @echo "Making $@ in ."
+
+        autoconf
+        
+autoheader:
+        @echo "Making $@ in ."
+
+        autoheader
+
-clean: clean-recursive
-        @echo "Making $@ in ."

wire/trunk/config.h.in

@@ -63 +63 @@
-#undef HAVE_SYS_TYPES_H
-
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+#undef HAVE_SYS_VFS_H
+
-/* Define to 1 if you have the <termcap.h> header file. */
-#undef HAVE_TERMCAP_H

wire/trunk/configure

@@ -2476 +2476 @@
-
-# Check for warnings
+echo "$as_me:$LINENO: checking for warning flags" >&5
+echo $ECHO_N "checking for warning flags... $ECHO_C" >&6
-# Check whether --enable-warnings or --disable-warnings was given.
-if test "${enable_warnings+set}" = set; then
@@ -2482 +2484 @@
-fi;
-
+
+
-if test -n "$enable_warnings"; then
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
@@ -2534 +3044 @@
-
-# Check for glibc (Linux)
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
@@ -3960 +4469 @@
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate OpenSSL
-
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -3979 +4488 @@
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate OpenSSL
-
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -4210 +4719 @@
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate OpenSSL
-
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -4229 +4738 @@
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate OpenSSL
-
-If you installed OpenSSL into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -4554 +5063 @@
-If you installed iconv into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate iconv
-
-If you installed iconv into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -4576 +5085 @@
-If you installed iconv into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate iconv
-
-If you installed iconv into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -5470 +5979 @@
-If you installed readline into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate readline
-
-If you installed readline into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -5489 +5998 @@
-If you installed readline into a non-standard directory, please run:
-
-env 
+
-echo "$as_me: error: could not locate readline
-
-If you installed readline into a non-standard directory, please run:
-
-env 
+
-   { (exit 1); exit 1; }; }
-
@@ -6032 +6541 @@
-
-
+
-for ac_header in  \
+        sys/vfs.h \
-        termcap.h \
-        termios.h \
@@ -6742 +7253 @@
-          ac_config_files="$ac_config_files wire/Makefile"
-
+
+# Configure libzanka
+ac_configure_args="$ac_configure_args --enable-ssl --enable-termcap --enable-iconv"
-
-
@@ -8052 +8566 @@
-fi
-
+
+
+#######################################################################
+# Print summary
+
+A=$(eval echo ${bindir});       A=$(eval echo ${A})
+B=$(eval echo ${mandir});       B=$(eval echo ${B})
+
+echo ""
+echo "wire has been configured with the following options:"
+
+echo ""
+echo "              Binary: ${A}/wire"
+echo "         Manual page: ${B}/man1/wire.1"
+
+echo ""
+echo "                Host: ${host}"
+echo "            Compiler: ${CC}"
+echo "      Compiler flags: ${CFLAGS}"
+echo "  Preprocessor flags: ${CPPFLAGS}"
+echo "        Linker flags: ${LDFLAGS}"
+echo "           Libraries: ${LIBS}"
+
+echo ""

wire/trunk/configure.in

@@ -23 +23 @@
-If you installed $1 into a non-standard directory, please run:
-
-env 
+
-])
-
@@ -45 +45 @@
-
-# Check for warnings
+AC_MSG_CHECKING([for warning flags])
-AC_ARG_ENABLE([warnings], AC_HELP_STRING([--enable-warnings], [enable warnings]))
-
+AC_DEFUN([WR_WARNING_TRY], [
+        OLD_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $1"
+
+        AC_TRY_RUN([
+                int main(void) {
+                        return 0;
+                }
+        ], [
+                WARNFLAGS="$WARNFLAGS $1"
+        ], [
+                CFLAGS="$OLD_CFLAGS"
+        ])
+])
+
-if test -n "$enable_warnings"; then
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
@@ -263 +291 @@
-
-AC_CHECK_HEADERS([ \
+        sys/vfs.h \
-        termcap.h \
-        termios.h \
@@ -285 +314 @@
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([wire/Makefile])
+
+# Configure libzanka
+ac_configure_args="$ac_configure_args --enable-ssl --enable-termcap --enable-iconv"
-AC_CONFIG_SUBDIRS([libzanka])
-
-AC_OUTPUT
+
+
+#######################################################################
+# Print summary
+
+A=$(eval echo ${bindir});       A=$(eval echo ${A})
+B=$(eval echo ${mandir});       B=$(eval echo ${B})
+
+echo ""
+echo "wire has been configured with the following options:"
+
+echo ""
+echo "              Binary: ${A}/wire"
+echo "         Manual page: ${B}/man1/wire.1"
+
+echo ""
+echo "                Host: ${host}"
+echo "            Compiler: ${CC}"
+echo "      Compiler flags: ${CFLAGS}"
+echo "  Preprocessor flags: ${CPPFLAGS}"
+echo "        Linker flags: ${LDFLAGS}"
+echo "           Libraries: ${LIBS}"
+
+echo ""

wire/trunk/man/wire.1

@@ -25 +25 @@
-.\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-Dec 18, 2004
+Oct 28, 2005
-.Dt WIRE 1
-.Os
@@ -57 +57 @@
-.Nm wire
-will log extra debug messages to the chat window.
-.It Fl c Ar charset
-Sets the character set that
-.Nm wire
-will convert all text from the server to. This string is passed directly to the
-.Xr iconv 3
-character conversion system. The default value is
-.Sq ISO-8859-1 .
-.It Fl h
-Displays a brief help message and exits.
@@ -77 +70 @@
-for next. The
-.Nm close
-. Note that closing the main window is the same as exiting the program
+, or, if in the main window, disconnects from the server
-.Sh COMMANDS
-The following commands can be given to
@@ -101 +94 @@
-.Pp
-Example: /clear
+.It Nm charset Ar charset
+Sets the character set that
+.Nm wire
+will convert all text from the server to. This string is passed directly to the
+.Xr iconv 3
+character conversion system. The default value is
+.Sq ISO-8859-1 .
+.Pp
+Example: /charset UTF-8
-.It Nm clearnews
-Clear the news.

wire/trunk/wire/Makefile.in

@@ -7 +7 @@
-top_srcdir      = @top_srcdir@
-
-
+inal
-                          users.o version.o windows.o
-
+inal
-                          users.h version.h windows.h
-

wire/trunk/wire/client.c

@@ -29 +29 @@
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <openssl/err.h>
-#include <openssl/sha.h>
-#include <openssl/ssl.h>
-#include <readline/readline.h>
-#include <zanka/zanka.h>
-
@@ -60 +43 @@
-#include "windows.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+