diff -urN pure-0.6p/c/pure-client.c pure-0.6pl2/c/pure-client.c --- pure-0.6p/c/pure-client.c Sun Dec 31 01:31:42 2000 +++ pure-0.6pl2/c/pure-client.c Tue Nov 13 02:31:23 2001 @@ -1,7 +1,7 @@ /* * pure-client.c : common client process for PURE network service. * - * $Id: pure-client.c,v 1.1 2000/12/30 16:31:42 simm Exp $ + * $Id: pure-client.c,v 1.1.2.1 2001/11/12 17:31:23 simm Exp $ */ #include "pure.h" @@ -13,8 +13,11 @@ struct hostent* hp; /* get IP address of peer */ - if ( !(hp = gethostbyname( peer->name )) ) return -1; - peer->address = ntohl( ( (struct in_addr*)hp -> h_addr_list[0] ) -> s_addr ); + if(strchr(peer->name, '.')) { + if ( !(hp = gethostbyname( peer->name )) ) return -1; + peer->address = ntohl( ( (struct in_addr*)hp -> h_addr_list[0] ) -> s_addr ); + } else + peer->address = strtoul(peer->name, NULL, 0); /* make connection */ if ( ( sock = socket( AF_INET, SOCK_STREAM, 0 ) ) < 0 ) return -2; diff -urN pure-0.6p/c/pure.h pure-0.6pl2/c/pure.h --- pure-0.6p/c/pure.h Sun Dec 31 01:31:42 2000 +++ pure-0.6pl2/c/pure.h Tue Nov 13 02:31:23 2001 @@ -1,7 +1,7 @@ /* * pure.h : common header for PURE service. * - * $Id: pure.h,v 1.1 2000/12/30 16:31:42 simm Exp $ + * $Id: pure.h,v 1.1.2.1 2001/11/12 17:31:23 simm Exp $ */ #include @@ -10,12 +10,12 @@ #include #include #include -#include #include #include #include #include #include +#include #ifndef O_BINARY #define O_BINARY (0) diff -urN pure-0.6p/pure-cs.el pure-0.6pl2/pure-cs.el --- pure-0.6p/pure-cs.el Sat Sep 1 04:33:54 2001 +++ pure-0.6pl2/pure-cs.el Thu Dec 13 01:07:07 2001 @@ -5,7 +5,7 @@ ;; Author: SHIMADA Mitsunobu ;; Keywords: PURE, coding-system -;; $Id: pure-cs.el,v 1.7 2001/07/28 16:36:15 simm Exp $ +;; $Id: pure-cs.el,v 1.7.2.1 2001/12/12 16:07:07 simm Exp $ ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -113,7 +113,8 @@ (setq pt (1- (point))) (if (looking-at pure-cs-iso646-ank-regexp) (let ((tmpstr - (decode-coding-string (buffer-substring pt (match-end 0)) 'x-ctext)) + (decode-coding-string (buffer-substring pt (match-end 0)) + (if (featurep 'xemacs) 'ctext 'x-ctext))) (nchars (if pt (- (match-end 0) pt) 3))) (goto-char pt) (delete-char nchars) diff -urN pure-0.6p/pure-make.el pure-0.6pl2/pure-make.el --- pure-0.6p/pure-make.el Mon Sep 17 00:34:37 2001 +++ pure-0.6pl2/pure-make.el Thu Sep 27 03:20:00 2001 @@ -5,7 +5,7 @@ ;; Author: SHIMADA Mitsunobu ;; Keywords: PURE, make, install -;; $Id: pure-make.el,v 1.5 2001/09/16 15:30:24 simm Exp $ +;; $Id: pure-make.el,v 1.5.2.1 2001/09/26 18:20:00 simm Exp $ ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -123,8 +123,8 @@ (error "Canot make directory `%s'" dir)) (if (fboundp 'make-directory-internal) (make-directory-internal dir) - (call-process "mkdir" nil nil nil dir)) - dir))) + (call-process "mkdir" nil nil nil dir))) + dir)) (defun pure-make-get-filename (item) "Get filename from `item'. @@ -194,6 +194,8 @@ (defun pure-make-install-package (list package &optional base &rest alist) "Install Emacs Lisp in current directory as XEmacs package `package', according to `list'." (let* ((pbase (or base pure-make-package-base)) + (pkginfo (expand-file-name "pkginfo/" pbase)) + (infodir (expand-file-name "info/" pbase)) (lispbase (expand-file-name "lisp/" pbase)) (lispdir (expand-file-name package lispbase)) (etcbase (expand-file-name "etc/" pbase)) diff -urN pure-0.6p/pure-vs.el pure-0.6pl2/pure-vs.el --- pure-0.6p/pure-vs.el Mon Sep 17 00:43:41 2001 +++ pure-0.6pl2/pure-vs.el Thu Dec 13 01:34:15 2001 @@ -5,7 +5,7 @@ ;; Author: SHIMADA Mitsunobu ;; Keywords: PURE, version-string -;; $Id: pure-vs.el,v 1.7 2001/06/28 15:18:02 simm Exp $ +;; $Id: pure-vs.el,v 1.7.2.3 2001/12/12 16:34:15 simm Exp $ ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -39,17 +39,27 @@ ; "Minor version number of PURE current version") (defconst pure-version-branch 6 "Branch number of PURE current version") -(defconst pure-version-cvs nil - "If non-nil, this version of PURE is CVS version. -If nil, package version.") -(defconst pure-version-string +(defconst pure-version-number (if (boundp 'pure-version-minor) - (format "%d.%d.%d%c" - pure-version-major pure-version-minor pure-version-branch - (if pure-version-cvs ?c ?p)) - (format "%d.%d%c" - pure-version-major pure-version-branch - (if pure-version-cvs ?c ?p))) + (format "%d.%d.%d" pure-version-major pure-version-minor pure-version-branch) + (format "%d.%d" pure-version-major pure-version-branch)) + "Version number string of PURE") + +(defconst pure-version-suffix 2 + "PURE version name suffix. + NIL : Package release version + Number: Patch level to the release version + String: CVS version + \"c\": main trunk of CVS version + \"m\": minesweepers' version (simm's working branch)") +(defconst pure-version-string + (cond + ((null pure-version-suffix) + (concat pure-version-number "p")) + ((numberp pure-version-suffix) + (concat pure-version-number "pl" (number-to-string pure-version-suffix))) + ((stringp pure-version-suffix) + (concat pure-version-number pure-version-suffix))) "Version string of PURE current version") ;;