home *** CD-ROM | disk | FTP | other *** search
/ Source Code 1994 March / Source_Code_CD-ROM_Walnut_Creek_March_1994.iso / compsrcs / x / volume19 / xgetftp / patch01 < prev    next >
Encoding:
Text File  |  1993-04-27  |  26.1 KB  |  770 lines
  1. Newsgroups: comp.sources.x
  2. From: salim@tigger.cs.colorado.edu (Salim Alam)
  3. Subject: v19i043:  xgetftp - Friendly anonymous ftp tool, Patch01
  4. Message-ID: <1993Mar16.220946.8877@sparky.imd.sterling.com>
  5. X-Md4-Signature: 8bcedad93d24866d6b14a8cf10dd2c9d
  6. Date: Tue, 16 Mar 1993 22:09:46 GMT
  7. Approved: chris@sparky.imd.sterling.com
  8.  
  9. Submitted-by: salim@tigger.cs.colorado.edu (Salim Alam)
  10. Posting-number: Volume 19, Issue 43
  11. Archive-name: xgetftp/patch01
  12. Environment: X11, OSF/Motif
  13. Patch-To: xgetftp: Volume 19, Issue 22-25
  14.  
  15.  
  16. This patches xgetftp from v1.0 to v1.1.  The patch fixes a couple of bugs
  17. that were causing compilation problems for some people.  Also, the Makefile
  18. included is more easily editable in case xmkmf doesnt work.
  19.  
  20. The patch is in context-diff format and can be applied by redirecting to
  21. the patch program.
  22.  
  23. Thanks.
  24.  
  25. -Salim
  26.  
  27. ---------------------- cut here ----------------------------------------
  28. #! /bin/sh
  29. # This is a shell archive, meaning:
  30. # 1. Remove everything above the #! /bin/sh line.
  31. # 2. Save the resulting text in a file.
  32. # 3. Execute the file with /bin/sh (not csh) to create the files:
  33. #    xgetftp-patch
  34. # This archive created: Fri Mar 12 16:07:34 1993
  35. export PATH; PATH=/bin:$PATH
  36. if test -f 'xgetftp-patch'
  37. then
  38.     echo shar: will not over-write existing file "'xgetftp-patch'"
  39. else
  40. cat << \SHAR_EOF > 'xgetftp-patch'
  41. Index: patchlevel.h
  42. *** xgetftp-v1.0/patchlevel.h    Mon Mar  8 13:55:12 1993
  43. --- xgetftp-v1.1/patchlevel.h    Fri Mar 12 15:47:15 1993
  44. ***************
  45. *** 1,2 ****
  46.   #define VERSION        1
  47. ! #define PATCHLEVEL    0
  48. --- 1,2 ----
  49.   #define VERSION        1
  50. ! #define PATCHLEVEL    1
  51. Index: Makefile
  52. *** xgetftp-v1.0/Makefile    Mon Mar  8 13:55:11 1993
  53. --- xgetftp-v1.1/Makefile    Fri Mar 12 15:47:13 1993
  54. ***************
  55. *** 1,478 ****
  56. - # Makefile generated by imake - do not edit!
  57. - # $XConsortium: imake.c,v 1.65 91/07/25 17:50:17 rws Exp $
  58.   #
  59. ! # The cpp used on this machine replaces all newlines and multiple tabs and
  60. ! # spaces in a macro expansion with a single space.  Imake tries to compensate
  61. ! # for this, but is not always successful.
  62.   #
  63. ! 
  64. ! # -------------------------------------------------------------------------
  65. ! # Makefile generated from "Imake.tmpl" and </tmp/IIf.022747>
  66. ! # $XConsortium: Imake.tmpl,v 1.139 91/09/16 08:52:48 rws Exp $
  67. ! #
  68. ! # Platform-specific parameters may be set in the appropriate <vendor>.cf
  69. ! # configuration files.  Site-specific parameters should be set in the file
  70. ! # site.def.  Full rebuilds are recommended if any parameters are changed.
  71. ! #
  72. ! # If your C preprocessor does not define any unique symbols, you will need
  73. ! # to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing
  74. ! # "make World" the first time).
  75.   #
  76. ! 
  77. ! # -------------------------------------------------------------------------
  78. ! # site-specific configuration parameters that need to come before
  79. ! # the platform-specific parameters - edit site.def to change
  80. ! 
  81. ! # site:  $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $
  82. ! 
  83. ! # -------------------------------------------------------------------------
  84. ! # platform-specific configuration parameters - edit sun.cf to change
  85. ! 
  86. ! # platform:  $XConsortium: sun.cf,v 1.72.1.1 92/03/18 13:13:37 rws Exp $
  87. ! 
  88. ! # operating system:  SunOS 4.1
  89. ! 
  90. ! # $XConsortium: sunLib.rules,v 1.7 91/12/20 11:19:47 rws Exp $
  91. ! 
  92. ! # -------------------------------------------------------------------------
  93. ! # site-specific configuration parameters that go after
  94. ! # the platform-specific parameters - edit site.def to change
  95. ! 
  96. ! # site:  $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $
  97. ! 
  98. !             SHELL = /bin/sh
  99. ! 
  100. !               TOP = .
  101. !       CURRENT_DIR = .
  102. ! 
  103. !                AR = ar clq
  104. !   BOOTSTRAPCFLAGS =
  105. !                CC = cc
  106. !                AS = as
  107. ! 
  108. !          COMPRESS = compress
  109. !               CPP = /lib/cpp $(STD_CPP_DEFINES)
  110. !     PREPROCESSCMD = cc -E $(STD_CPP_DEFINES)
  111. !           INSTALL = install
  112. !                LD = ld
  113. !              LINT = lint
  114. !       LINTLIBFLAG = -C
  115. !          LINTOPTS = -axz
  116. !                LN = ln -s
  117. !              MAKE = make
  118. !                MV = mv
  119. !                CP = cp
  120. ! 
  121. !            RANLIB = ranlib
  122. !   RANLIBINSTFLAGS =
  123. ! 
  124. !                RM = rm -f
  125. !             TROFF = psroff
  126. !          MSMACROS = -ms
  127. !               TBL = tbl
  128. !               EQN = eqn
  129. !      STD_INCLUDES =
  130. !   STD_CPP_DEFINES =
  131. !       STD_DEFINES =
  132. !  EXTRA_LOAD_FLAGS =
  133. !   EXTRA_LIBRARIES =
  134. !              TAGS = ctags
  135. ! 
  136. !     SHAREDCODEDEF = -DSHAREDCODE
  137. !          SHLIBDEF = -DSUNSHLIB
  138. ! 
  139. !     PROTO_DEFINES =
  140. ! 
  141. !      INSTPGMFLAGS =
  142. ! 
  143. !      INSTBINFLAGS = -m 0755
  144. !      INSTUIDFLAGS = -m 4755
  145. !      INSTLIBFLAGS = -m 0644
  146. !      INSTINCFLAGS = -m 0444
  147. !      INSTMANFLAGS = -m 0444
  148. !      INSTDATFLAGS = -m 0444
  149. !     INSTKMEMFLAGS = -g kmem -m 2755
  150. ! 
  151. !       PROJECTROOT = /usr/local/X.V11R5
  152. ! 
  153. !      TOP_INCLUDES = -I$(INCROOT)
  154. ! 
  155. !       CDEBUGFLAGS = -O
  156. !         CCOPTIONS = -pipe
  157. ! 
  158. !       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
  159. !        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(DEFINES)
  160. !            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
  161. !         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES)
  162. ! 
  163. !            LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
  164. ! 
  165. !         LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(LOCAL_LDFLAGS) -L$(USRLIBDIR)
  166. ! 
  167. !    LDCOMBINEFLAGS = -X -r
  168. !       DEPENDFLAGS =
  169. ! 
  170. !         MACROFILE = sun.cf
  171. !            RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
  172. ! 
  173. !     IMAKE_DEFINES =
  174. ! 
  175. !          IRULESRC = $(CONFIGDIR)
  176. !         IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
  177. ! 
  178. !      ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \
  179. !             $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \
  180. !             $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES)
  181. ! 
  182. ! # -------------------------------------------------------------------------
  183. ! # X Window System Build Parameters
  184. ! # $XConsortium: Project.tmpl,v 1.138 91/09/10 09:02:12 rws Exp $
  185. ! 
  186. ! # -------------------------------------------------------------------------
  187. ! # X Window System make variables; this need to be coordinated with rules
  188. ! 
  189. !           PATHSEP = /
  190. !         USRLIBDIR = /usr/local/X.V11R5/lib
  191. !            BINDIR = /usr/local/X.V11R5/bin
  192. !           INCROOT = /usr/local/X.V11R5/include
  193. !      BUILDINCROOT = $(TOP)
  194. !       BUILDINCDIR = $(BUILDINCROOT)/X11
  195. !       BUILDINCTOP = ..
  196. !            INCDIR = $(INCROOT)/X11
  197. !            ADMDIR = /usr/adm
  198. !            LIBDIR = $(USRLIBDIR)
  199. !         CONFIGDIR = $(LIBDIR)/config
  200. !        LINTLIBDIR = $(USRLIBDIR)/lint
  201. ! 
  202. !           FONTDIR = $(LIBDIR)/fonts
  203. !          XINITDIR = $(LIBDIR)/xinit
  204. !            XDMDIR = $(LIBDIR)/xdm
  205. !            TWMDIR = $(LIBDIR)/twm
  206. !           MANPATH = /usr/local/X.V11R5/man
  207. !     MANSOURCEPATH = $(MANPATH)/man
  208. !         MANSUFFIX = 1
  209. !      LIBMANSUFFIX = 3
  210. !            MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
  211. !         LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)
  212. !            NLSDIR = $(LIBDIR)/nls
  213. !         PEXAPIDIR = $(LIBDIR)/PEX
  214. !       XAPPLOADDIR = $(LIBDIR)/app-defaults
  215. !        FONTCFLAGS = -t
  216. ! 
  217. !      INSTAPPFLAGS = $(INSTDATFLAGS)
  218. ! 
  219. !             IMAKE = imake
  220. !            DEPEND = makedepend
  221. !               RGB = rgb
  222. ! 
  223. !             FONTC = bdftopcf
  224. ! 
  225. !         MKFONTDIR = mkfontdir
  226. !         MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier
  227. ! 
  228. !         CONFIGSRC = $(TOP)/config
  229. !        DOCUTILSRC = $(TOP)/doc/util
  230. !         CLIENTSRC = $(TOP)/clients
  231. !           DEMOSRC = $(TOP)/demos
  232. !            LIBSRC = $(TOP)/lib
  233. !           FONTSRC = $(TOP)/fonts
  234. !        INCLUDESRC = $(TOP)/X11
  235. !         SERVERSRC = $(TOP)/server
  236. !           UTILSRC = $(TOP)/util
  237. !         SCRIPTSRC = $(UTILSRC)/scripts
  238. !        EXAMPLESRC = $(TOP)/examples
  239. !        CONTRIBSRC = $(TOP)/../contrib
  240. !            DOCSRC = $(TOP)/doc
  241. !            RGBSRC = $(TOP)/rgb
  242. !         DEPENDSRC = $(UTILSRC)/makedepend
  243. !          IMAKESRC = $(CONFIGSRC)
  244. !          XAUTHSRC = $(LIBSRC)/Xau
  245. !           XLIBSRC = $(LIBSRC)/X
  246. !            XMUSRC = $(LIBSRC)/Xmu
  247. !        TOOLKITSRC = $(LIBSRC)/Xt
  248. !        AWIDGETSRC = $(LIBSRC)/Xaw
  249. !        OLDXLIBSRC = $(LIBSRC)/oldX
  250. !       XDMCPLIBSRC = $(LIBSRC)/Xdmcp
  251. !       BDFTOSNFSRC = $(FONTSRC)/bdftosnf
  252. !       BDFTOSNFSRC = $(FONTSRC)/clients/bdftosnf
  253. !       BDFTOPCFSRC = $(FONTSRC)/clients/bdftopcf
  254. !      MKFONTDIRSRC = $(FONTSRC)/clients/mkfontdir
  255. !          FSLIBSRC = $(FONTSRC)/lib/fs
  256. !     FONTSERVERSRC = $(FONTSRC)/server
  257. !      EXTENSIONSRC = $(TOP)/extensions
  258. !          XILIBSRC = $(EXTENSIONSRC)/lib/xinput
  259. !       PHIGSLIBSRC = $(EXTENSIONSRC)/lib/PEX
  260. ! 
  261. ! # $XConsortium: sunLib.tmpl,v 1.14.1.1 92/03/17 14:58:46 rws Exp $
  262. ! 
  263. ! SHLIBLDFLAGS = -assert pure-text
  264. ! PICFLAGS = -pic
  265. ! 
  266. !   DEPEXTENSIONLIB =
  267. !      EXTENSIONLIB = -lXext
  268. ! 
  269. !           DEPXLIB = $(DEPEXTENSIONLIB)
  270. !              XLIB = $(EXTENSIONLIB) -lX11
  271. ! 
  272. !         DEPXMULIB = $(USRLIBDIR)/libXmu.sa.$(SOXMUREV)
  273. !        XMULIBONLY = -lXmu
  274. !            XMULIB = -lXmu
  275. ! 
  276. !        DEPOLDXLIB =
  277. !           OLDXLIB = -loldX
  278. ! 
  279. !       DEPXTOOLLIB = $(USRLIBDIR)/libXt.sa.$(SOXTREV)
  280. !          XTOOLLIB = -lXt
  281. ! 
  282. !         DEPXAWLIB = $(USRLIBDIR)/libXaw.sa.$(SOXAWREV)
  283. !            XAWLIB = -lXaw
  284. ! 
  285. !         DEPXILIB =
  286. !            XILIB = -lXi
  287. ! 
  288. !         SOXLIBREV = 4.10
  289. !           SOXTREV = 4.10
  290. !          SOXAWREV = 5.0
  291. !         SOOLDXREV = 4.10
  292. !          SOXMUREV = 4.10
  293. !         SOXEXTREV = 4.10
  294. !       SOXINPUTREV = 4.10
  295. ! 
  296. !       DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
  297. !          XAUTHLIB =  -lXau
  298. !       DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
  299. !          XDMCPLIB =  -lXdmcp
  300. ! 
  301. !         DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
  302. !            PHIGSLIB =  -lphigs
  303. ! 
  304. !        DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
  305. !           XBSDLIB =  -lXbsd
  306. ! 
  307. !  LINTEXTENSIONLIB = $(LINTLIBDIR)/llib-lXext.ln
  308. !          LINTXLIB = $(LINTLIBDIR)/llib-lX11.ln
  309. !           LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
  310. !         LINTXTOOL = $(LINTLIBDIR)/llib-lXt.ln
  311. !           LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
  312. !            LINTXI = $(LINTLIBDIR)/llib-lXi.ln
  313. !         LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
  314. ! 
  315. !           DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
  316. ! 
  317. !          DEPLIBS1 = $(DEPLIBS)
  318. !          DEPLIBS2 = $(DEPLIBS)
  319. !          DEPLIBS3 = $(DEPLIBS)
  320. ! 
  321. ! # -------------------------------------------------------------------------
  322. ! # Imake rules for building libraries, programs, scripts, and data files
  323. ! # rules:  $XConsortium: Imake.rules,v 1.123 91/09/16 20:12:16 rws Exp $
  324. ! 
  325. ! # -------------------------------------------------------------------------
  326. ! # start of Imakefile
  327. ! 
  328. !                  CC = gcc
  329. ! #       CDEBUGFLAGS = -g -DDEBUG
  330. !     EXTRA_LIBRARIES = -lXm -lXt -lX11
  331. !                SRCS = cache.c control.c file_cache.c ftp.c \
  332. !                         main.c prefs.c ui_funcs.c
  333. !                OBJS = cache.o control.o file_cache.o ftp.o \
  334. !                         main.o prefs.o ui_funcs.o
  335. ! 
  336. !  PROGRAM = xgetftp
  337. ! 
  338. ! all:: xgetftp
  339. ! 
  340. ! xgetftp: $(OBJS) $(DEPLIBS)
  341. !     $(RM) $@
  342. !     $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
  343. ! 
  344. ! saber_xgetftp:: $(SRCS)
  345. !     # load $(ALLDEFINES) $(SRCS) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
  346. ! 
  347. ! osaber_xgetftp:: $(OBJS)
  348. !     # load $(ALLDEFINES) $(OBJS) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
  349. ! 
  350. ! install:: xgetftp
  351. !     @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \
  352. !     else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi
  353. !     $(INSTALL) -c $(INSTPGMFLAGS)  xgetftp $(DESTDIR)$(BINDIR)
  354. ! 
  355. ! install.man:: xgetftp.man
  356. !     @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
  357. !     else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
  358. !     $(INSTALL) -c $(INSTMANFLAGS) xgetftp.man $(DESTDIR)$(MANDIR)/xgetftp.$(MANSUFFIX)
  359. ! 
  360. ! depend::
  361. !     $(DEPEND) $(DEPENDFLAGS) -s "# DO NOT DELETE" -- $(ALLDEFINES) -- $(SRCS)
  362. ! 
  363. ! lint:
  364. !     $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
  365. ! lint1:
  366. !     $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
  367. ! 
  368. ! clean::
  369. !     $(RM) $(PROGRAM)
  370. ! 
  371. ! # -------------------------------------------------------------------------
  372. ! # common rules for all Makefiles - do not edit
  373. ! 
  374. ! emptyrule::
  375. ! 
  376. ! clean::
  377. !     $(RM_CMD) "#"*
  378. ! 
  379. ! Makefile::
  380. !     -@if [ -f Makefile ]; then set -x; \
  381. !     $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
  382. !     else exit 0; fi
  383. !     $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
  384. ! 
  385. ! tags::
  386. !     $(TAGS) -w *.[ch]
  387. !     $(TAGS) -xw *.[ch] > TAGS
  388. ! 
  389. ! saber:
  390. !     # load $(ALLDEFINES) $(SRCS)
  391. ! 
  392. ! osaber:
  393. !     # load $(ALLDEFINES) $(OBJS)
  394. ! 
  395. ! # -------------------------------------------------------------------------
  396. ! # empty rules for directories that do not have SUBDIRS - do not edit
  397. ! 
  398. ! install::
  399. !     @echo "install in $(CURRENT_DIR) done"
  400. ! 
  401. ! install.man::
  402. !     @echo "install.man in $(CURRENT_DIR) done"
  403. ! 
  404. ! Makefiles::
  405. ! 
  406. ! includes::
  407. ! 
  408. ! # -------------------------------------------------------------------------
  409. ! # dependencies generated by makedepend
  410.   
  411. ! # DO NOT DELETE
  412.   
  413. ! cache.o: /usr/include/stdio.h cache.h
  414. ! control.o: /usr/local/X.V11R5/include/X11/Xos.h
  415. ! control.o: /usr/local/X.V11R5/include/X11/Xosdefs.h /usr/include/sys/types.h
  416. ! control.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
  417. ! control.o: /usr/include/string.h /usr/include/fcntl.h
  418. ! control.o: /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h
  419. ! control.o: /usr/include/unistd.h /usr/include/sys/time.h
  420. ! control.o: /usr/include/sys/time.h /usr/include/stdio.h /usr/include/malloc.h
  421. ! control.o: ftp.h cache.h file_cache.h control.h prefs.h
  422. ! control.o: /usr/local/X.V11R5/include/X11/Intrinsic.h
  423. ! control.o: /usr/local/X.V11R5/include/X11/Xlib.h
  424. ! control.o: /usr/local/X.V11R5/include/X11/X.h
  425. ! control.o: /usr/local/X.V11R5/include/X11/Xfuncproto.h /usr/include/stddef.h
  426. ! control.o: /usr/local/X.V11R5/include/X11/Xutil.h
  427. ! control.o: /usr/local/X.V11R5/include/X11/Xresource.h
  428. ! control.o: /usr/local/X.V11R5/include/X11/Core.h
  429. ! control.o: /usr/local/X.V11R5/include/X11/Composite.h
  430. ! control.o: /usr/local/X.V11R5/include/X11/Constraint.h
  431. ! control.o: /usr/local/X.V11R5/include/X11/Object.h
  432. ! control.o: /usr/local/X.V11R5/include/X11/RectObj.h
  433. ! file_cache.o: /usr/include/stdio.h /usr/local/X.V11R5/include/X11/Xos.h
  434. ! file_cache.o: /usr/local/X.V11R5/include/X11/Xosdefs.h
  435. ! file_cache.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
  436. ! file_cache.o: /usr/include/sys/sysmacros.h /usr/include/string.h
  437. ! file_cache.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
  438. ! file_cache.o: /usr/include/sys/stat.h /usr/include/unistd.h
  439. ! file_cache.o: /usr/include/sys/time.h /usr/include/sys/time.h
  440. ! file_cache.o: /usr/include/malloc.h /usr/include/stdlib.h
  441. ! file_cache.o: /usr/include/dirent.h /usr/include/sys/dirent.h
  442. ! ftp.o: /usr/local/X.V11R5/include/X11/Xos.h
  443. ! ftp.o: /usr/local/X.V11R5/include/X11/Xosdefs.h /usr/include/sys/types.h
  444. ! ftp.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
  445. ! ftp.o: /usr/include/string.h /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
  446. ! ftp.o: /usr/include/sys/stat.h /usr/include/unistd.h /usr/include/sys/time.h
  447. ! ftp.o: /usr/include/sys/time.h /usr/include/stdio.h /usr/include/sys/socket.h
  448. ! ftp.o: /usr/include/netinet/in.h /usr/include/arpa/inet.h
  449. ! ftp.o: /usr/include/netdb.h /usr/include/errno.h /usr/include/sys/errno.h
  450. ! ftp.o: /usr/local/X.V11R5/include/X11/Intrinsic.h
  451. ! ftp.o: /usr/local/X.V11R5/include/X11/Xlib.h
  452. ! ftp.o: /usr/local/X.V11R5/include/X11/X.h
  453. ! ftp.o: /usr/local/X.V11R5/include/X11/Xfuncproto.h /usr/include/stddef.h
  454. ! ftp.o: /usr/local/X.V11R5/include/X11/Xutil.h
  455. ! ftp.o: /usr/local/X.V11R5/include/X11/Xresource.h
  456. ! ftp.o: /usr/local/X.V11R5/include/X11/Core.h
  457. ! ftp.o: /usr/local/X.V11R5/include/X11/Composite.h
  458. ! ftp.o: /usr/local/X.V11R5/include/X11/Constraint.h
  459. ! ftp.o: /usr/local/X.V11R5/include/X11/Object.h
  460. ! ftp.o: /usr/local/X.V11R5/include/X11/RectObj.h
  461. ! main.o: /usr/local/X.V11R5/include/X11/Xos.h
  462. ! main.o: /usr/local/X.V11R5/include/X11/Xosdefs.h /usr/include/sys/types.h
  463. ! main.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
  464. ! main.o: /usr/include/string.h /usr/include/fcntl.h
  465. ! main.o: /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h
  466. ! main.o: /usr/include/unistd.h /usr/include/sys/time.h /usr/include/sys/time.h
  467. ! main.o: /usr/local/X.V11R5/include/Xm/Xm.h
  468. ! main.o: /usr/local/X.V11R5/include/X11/Intrinsic.h
  469. ! main.o: /usr/local/X.V11R5/include/X11/Xlib.h
  470. ! main.o: /usr/local/X.V11R5/include/X11/X.h
  471. ! main.o: /usr/local/X.V11R5/include/X11/Xfuncproto.h /usr/include/stddef.h
  472. ! main.o: /usr/local/X.V11R5/include/X11/Xutil.h
  473. ! main.o: /usr/local/X.V11R5/include/X11/Xresource.h
  474. ! main.o: /usr/local/X.V11R5/include/X11/Core.h
  475. ! main.o: /usr/local/X.V11R5/include/X11/Composite.h
  476. ! main.o: /usr/local/X.V11R5/include/X11/Constraint.h
  477. ! main.o: /usr/local/X.V11R5/include/X11/Object.h
  478. ! main.o: /usr/local/X.V11R5/include/X11/RectObj.h
  479. ! main.o: /usr/local/X.V11R5/include/X11/Shell.h
  480. ! main.o: /usr/local/X.V11R5/include/X11/Xatom.h
  481. ! main.o: /usr/local/X.V11R5/include/Xm/XmStrDefs.h
  482. ! main.o: /usr/local/X.V11R5/include/X11/StringDefs.h
  483. ! main.o: /usr/local/X.V11R5/include/Xm/VirtKeys.h
  484. ! main.o: /usr/local/X.V11R5/include/Xm/VendorS.h
  485. ! main.o: /usr/local/X.V11R5/include/Xm/PushBG.h
  486. ! main.o: /usr/local/X.V11R5/include/Xm/Text.h /usr/include/stdio.h
  487. ! main.o: /usr/local/X.V11R5/include/Xm/List.h /usr/include/signal.h
  488. ! main.o: /usr/include/sys/signal.h /usr/include/vm/faultcode.h
  489. ! main.o: /usr/include/pwd.h /usr/include/sys/socket.h /usr/include/netdb.h
  490. ! main.o: prefs.h control.h ui_funcs.h config.h patchlevel.h
  491. ! prefs.o: /usr/local/X.V11R5/include/X11/Xos.h
  492. ! prefs.o: /usr/local/X.V11R5/include/X11/Xosdefs.h /usr/include/sys/types.h
  493. ! prefs.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
  494. ! prefs.o: /usr/include/string.h /usr/include/fcntl.h
  495. ! prefs.o: /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h
  496. ! prefs.o: /usr/include/unistd.h /usr/include/sys/time.h
  497. ! prefs.o: /usr/include/sys/time.h /usr/include/stdlib.h /usr/include/stdio.h
  498. ! prefs.o: prefs.h
  499. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/cursorfont.h
  500. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/Xm.h
  501. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Intrinsic.h
  502. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Xlib.h /usr/include/sys/types.h
  503. ! ui_funcs.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
  504. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/X.h
  505. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Xfuncproto.h
  506. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Xosdefs.h /usr/include/stddef.h
  507. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Xutil.h
  508. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Xresource.h /usr/include/string.h
  509. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Core.h
  510. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Composite.h
  511. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Constraint.h
  512. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Object.h
  513. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/RectObj.h
  514. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Shell.h
  515. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/Xatom.h
  516. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/XmStrDefs.h
  517. ! ui_funcs.o: /usr/local/X.V11R5/include/X11/StringDefs.h
  518. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/VirtKeys.h
  519. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/VendorS.h
  520. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/MainW.h
  521. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/List.h
  522. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/RowColumn.h
  523. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/PushBG.h
  524. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/Form.h
  525. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/BulletinB.h
  526. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/CascadeB.h
  527. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/Frame.h
  528. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/LabelG.h
  529. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/Text.h /usr/include/stdio.h
  530. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/MessageB.h
  531. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/ToggleBG.h
  532. ! ui_funcs.o: /usr/local/X.V11R5/include/Xm/SelectioB.h prefs.h control.h
  533. ! ui_funcs.o: ui_funcs.h
  534. --- 1,17 ----
  535.   #
  536. ! # Sample makefile for xgetftp
  537.   #
  538. ! # Try to use this if xmkmf doesnt work.. you might have to change the
  539. ! # paths for the X include and lib stuff...
  540.   #
  541. ! CC = gcc
  542. ! #DFLAGS = -g -DDEBUG
  543. ! IDIR = -I/usr/local/X11/include
  544. ! LDIR = -L/usr/local/X11/lib
  545. ! OBJS = cache.o control.o file_cache.o ftp.o main.o prefs.o ui_funcs.o
  546.   
  547. ! xgetftp: $(OBJS)
  548. !     $(CC) -o xgetftp $(LDIR) $(OBJS) -lXm -lXt -lX11
  549.   
  550. ! .c.o :
  551. !     $(CC) -c $(DFLAGS) $(IDIR) $*.c
  552. Index: README
  553. *** xgetftp-v1.0/README    Mon Mar  8 13:55:11 1993
  554. --- xgetftp-v1.1/README    Fri Mar 12 15:47:13 1993
  555. ***************
  556. *** 1,5 ****
  557.   ==========================================================================
  558. ! xgetftp v1.0
  559.   ==========================================================================
  560.   
  561.   I. Authors:
  562. --- 1,5 ----
  563.   ==========================================================================
  564. ! xgetftp v1.1
  565.   ==========================================================================
  566.   
  567.   I. Authors:
  568. ***************
  569. *** 35,40 ****
  570. --- 35,44 ----
  571.   Please make sure that you carefully read the man page (an ASCII
  572.   version is available as xgetftp.doc if you don't want to install
  573.   a man page), especially the parts pertaining to the cache.
  574. + 
  575. + When first starting xgetftp, you will get a warning saying that the
  576. + ".xgetftprc" file was not found.  To create this file, simply select
  577. + "Set Preferences" from the File menu and click on "Save".
  578.   
  579.   ==========================================================================
  580.   
  581. Index: TODO
  582. *** xgetftp-v1.0/TODO    Mon Mar  8 13:55:11 1993
  583. --- xgetftp-v1.1/TODO    Fri Mar 12 15:47:13 1993
  584. ***************
  585. *** 1,5 ****
  586.   
  587. ! 
  588.   - Auto selection of "find text" widget in Archie Search
  589.   - Option to "uncache" viewed file -- on view file dialog
  590.   - Add simple "confirm" requester for caches... maybe better to confirm
  591. --- 1,5 ----
  592.   
  593. ! - Allow any user/passwd combination, not just anonymous
  594.   - Auto selection of "find text" widget in Archie Search
  595.   - Option to "uncache" viewed file -- on view file dialog
  596.   - Add simple "confirm" requester for caches... maybe better to confirm
  597. ***************
  598. *** 11,16 ****
  599. --- 11,17 ----
  600.     give us enough responses
  601.   - Cache-consistency checks
  602.   - Limiting size of dir. cache in memory
  603. + - A search template for directories, eg, *README*
  604.   - "Hidden files" preference
  605.   - Some kind of background/batch transfer capability
  606.   - Keep track of where user last exited at each site and take him/her back
  607. Index: ftp.c
  608. *** xgetftp-v1.0/ftp.c    Mon Mar  8 13:55:12 1993
  609. --- xgetftp-v1.1/ftp.c    Fri Mar 12 15:47:14 1993
  610. ***************
  611. *** 10,15 ****
  612. --- 10,16 ----
  613.    *  University of Colorado, Boulder
  614.    *
  615.    * MODIFICATION LOG:
  616. +  *  93.03.10 S.A. - better support for variable arguments
  617.    *  93.01.14 S.A. - fixed return bug in ftp_init_conn
  618.    *  92.12.29 S.A. - ftp_init_conn now handles some errors more gracefully.
  619.    *            also, better use of "reponse_stream".
  620. ***************
  621. *** 25,31 ****
  622. --- 26,36 ----
  623.   #include <arpa/inet.h>
  624.   #include <netdb.h>
  625.   #include <errno.h>
  626. + #ifdef USE_PROTOTYPES
  627.   #include <stdarg.h>
  628. + #else
  629. + #include <varargs.h>
  630. + #endif
  631.   
  632.   /* Special stuff for X-based I/O */
  633.   #define XGETFTP
  634. ***************
  635. *** 155,162 ****
  636.   }
  637.   
  638.   
  639. ! 
  640.   int ftp_send_command(char *fmt, ...)
  641.   /*
  642.    * Sends a command to the server.  The input parameters are in a
  643.    * "printf" form --- ie, a format specification string, followed
  644. --- 160,171 ----
  645.   }
  646.   
  647.   
  648. ! #ifdef USE_PROTOTYPES
  649.   int ftp_send_command(char *fmt, ...)
  650. + #else
  651. + int ftp_send_command(va_alist)
  652. + va_dcl
  653. + #endif
  654.   /*
  655.    * Sends a command to the server.  The input parameters are in a
  656.    * "printf" form --- ie, a format specification string, followed
  657. ***************
  658. *** 170,175 ****
  659. --- 179,187 ----
  660.    * checked for by the server.
  661.    */ 
  662.   {
  663. + #ifndef USE_PROTOTYPES
  664. +     char *fmt;
  665. + #endif
  666.       va_list ap;
  667.   
  668.   #ifdef DEBUG
  669. ***************
  670. *** 180,186 ****
  671.       fprintf(stderr, "\n");
  672.   #endif
  673.   
  674. !     va_start(ap, fmt);
  675.       vfprintf(commandfp, fmt, ap);
  676.       va_end(ap);
  677.       fprintf(commandfp, "\r\n");
  678. --- 192,204 ----
  679.       fprintf(stderr, "\n");
  680.   #endif
  681.   
  682. ! #ifdef USE_PROTOTYPES
  683. !     va_start(ap, format);
  684. ! #else
  685. !     va_start(ap);
  686. !     fmt = (char *)va_arg(ap, char *);
  687. ! #endif
  688. ! 
  689.       vfprintf(commandfp, fmt, ap);
  690.       va_end(ap);
  691.       fprintf(commandfp, "\r\n");
  692. Index: main.c
  693. *** xgetftp-v1.0/main.c    Mon Mar  8 13:55:12 1993
  694. --- xgetftp-v1.1/main.c    Fri Mar 12 15:47:14 1993
  695. ***************
  696. *** 215,221 ****
  697.           buf[len++] = buf[i];
  698.       }
  699.       buf[len] = '\0';
  700. !     XmTextInsert(archietextW, (XmTextPosition)*ppos, buf);
  701.       *ppos += len;
  702.       }
  703.       else
  704. --- 215,221 ----
  705.           buf[len++] = buf[i];
  706.       }
  707.       buf[len] = '\0';
  708. !     XmTextInsert(archietextW, (XmTextPosition)*ppos, (char *)buf);
  709.       *ppos += len;
  710.       }
  711.       else
  712. ***************
  713. *** 514,520 ****
  714.           buf[len++] = buf[i];
  715.       }
  716.       buf[len] = '\0';
  717. !     XmTextInsert(viewtextW, (XmTextPosition)*ppos, buf);
  718.       *ppos += len;
  719.       }
  720.       else
  721. --- 514,520 ----
  722.           buf[len++] = buf[i];
  723.       }
  724.       buf[len] = '\0';
  725. !     XmTextInsert(viewtextW, (XmTextPosition)*ppos, (char *)buf);
  726.       *ppos += len;
  727.       }
  728.       else
  729. Index: ui_funcs.c
  730. *** xgetftp-v1.0/ui_funcs.c    Mon Mar  8 13:55:13 1993
  731. --- xgetftp-v1.1/ui_funcs.c    Fri Mar 12 15:47:15 1993
  732. ***************
  733. *** 10,15 ****
  734. --- 10,16 ----
  735.    *  University of Colorado, Boulder
  736.    *
  737.    * MODIFICATION LOG:
  738. +  *  93.03.11 S.A. - Fixed mesg initialization problem.
  739.    *
  740.    **************************************************************************/
  741.   
  742. ***************
  743. *** 224,230 ****
  744.   {
  745.       Arg args[3];
  746.       XmString xmstr[2];
  747. !     char mesg[] = "xgetftp v1.0\n\nSalim Alam\nUniversity of Colorado, Boulder\n\nPlease email all bug reports and\ncomments to: salim@cs.colorado.edu";
  748.   
  749.       xmstr[0] = XmStringCreateLtoR(mesg, XmSTRING_DEFAULT_CHARSET);
  750.       XtSetArg(args[0], XmNmessageString, xmstr[0]);
  751. --- 225,231 ----
  752.   {
  753.       Arg args[3];
  754.       XmString xmstr[2];
  755. !     char *mesg = "xgetftp v1.1\n\nSalim Alam\nUniversity of Colorado, Boulder\n\nPlease email all bug reports and\ncomments to: salim@cs.colorado.edu";
  756.   
  757.       xmstr[0] = XmStringCreateLtoR(mesg, XmSTRING_DEFAULT_CHARSET);
  758.       XtSetArg(args[0], XmNmessageString, xmstr[0]);
  759. SHAR_EOF
  760. fi # end of overwriting check
  761. #    End of shell archive
  762. exit 0
  763.  
  764. exit 0 # Just in case...
  765. -- 
  766.   // chris@IMD.Sterling.COM            | Send comp.sources.x submissions to:
  767. \X/  Amiga - The only way to fly!      |
  768.  "It's intuitively obvious to the most |    sources-x@imd.sterling.com
  769.   casual observer..."                  |
  770.