home *** CD-ROM | disk | FTP | other *** search
/ Source Code 1994 March / Source_Code_CD-ROM_Walnut_Creek_March_1994.iso / compsrcs / reviewed / volume02 / ncmprss / patch01 < prev    next >
Encoding:
Internet Message Format  |  1992-10-12  |  6.3 KB
  1. From: Peter Jannesen <peter@ncs.nl>
  2. Subject: v02i027: ncompress - (Ver. 4.2.3) an improved file compressor, Patch01
  3. Newsgroups: comp.sources.reviewed
  4. Approved: csr@calvin.dgbt.doc.ca
  5.  
  6. Submitted-by: Peter Jannesen <peter@ncs.nl>
  7. Posting-number: Volume 2, Issue 27
  8. Archive-name: ncompress/patch01
  9. Patch-To: ncompress: Volume 2, Issue 24-26
  10.  
  11. This patch brings (N)compress to version 4.2.4.  It fixes various
  12. problems reported to the author after the initial posting to CSR.
  13.  
  14. This is a standard patch.  To apply, just direct this file to the
  15. "patch" program (e.g., "patch <patch1").
  16.  
  17.  
  18.  
  19. Index: Changes
  20. 1c1,10
  21. < (N)compress cersion 4.2.2
  22. ---
  23. > (N)compress version 4.2.4
  24. >     o Fix '-c' flag.
  25. >     o Fix utime error.
  26. >     o Added AMIGA support (Sascha Wildner).
  27. >     o Div. remarks added.
  28. > 
  29. > (N)compress version 4.2.3
  30. >     o Comp.source.reveiwed release.
  31. > 
  32. > (N)compress version 4.2.2
  33. Index: Makefile.def
  34. 1c1
  35. < # Makefile
  36. ---
  37. > # Makefile generated by build.
  38. 14a15,17
  39. > #    -DAMIGA=1                    Amiga support.
  40. > #    -DNOFUNCDEF=1                Disable libary function definitions in
  41. > #                                compress42.c
  42. 28c31
  43. < options= -DIRENT=1 -DUSERMEM=800000 -DREGISTERS=3  
  44. ---
  45. > options= -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3
  46. 32a36
  47. > 
  48. 37,48c41,54
  49. <         [ -f /usr/local/bin/compress ] &&             { rm -f /usr/local/bin/compress.old ;               mv /usr/local/bin/compress /usr/local/bin/compress.old ; }
  50. <         rm -f /usr/local/bin/uncompress /usr/local/bin/zcat
  51. <         cp compress /usr/local/bin/compress
  52. <         strip /usr/local/bin/compress
  53. <         rm -f /usr/local/bin/uncompress
  54. <         ln /usr/local/bin/compress /usr/local/bin/uncompress
  55. <         rm -f  /usr/local/bin/zcat
  56. <         ln -f /usr/local/bin/compress /usr/local/bin/zcat
  57. <         cp zcmp zdiff zmore /usr/local/bin/.
  58. <         chmod 0755 /usr/local/bin/compress /usr/local/bin/zcmp /usr/local/bin/zdiff                    /usr/local/bin/zmore
  59. <         cp compress.1 zcmp.1 zmore.1 /usr/local/man/man1/.
  60. <         chmod 0644 /usr/local/man/man1/compress.1 /usr/local/man/man1/zcmp.1                    /usr/local/man/man1/zmore.1
  61. ---
  62. >         [ -f $(BINDIR)/compress ] && \
  63. >             { rm -f $(BINDIR)/compress.old ; \
  64. >               mv $(BINDIR)/compress $(BINDIR)/compress.old ; }
  65. >         rm -f $(BINDIR)/uncompress $(BINDIR)/zcat
  66. >         cp compress $(BINDIR)/compress
  67. >         strip $(BINDIR)/compress
  68. >         rm -f $(BINDIR)/uncompress
  69. >         ln $(BINDIR)/compress $(BINDIR)/uncompress
  70. >         rm -f $(BINDIR)/zcat
  71. >         ln -f $(BINDIR)/compress $(BINDIR)/zcat
  72. >         cp zcmp zdiff zmore $(BINDIR)/.
  73. >         chmod 0755 $(BINDIR)/compress $(BINDIR)/zcmp $(BINDIR)/zdiff $(BINDIR)/zmore
  74. >         cp compress.1 zcmp.1 zmore.1 $(MANDIR)/.
  75. >         chmod 0644 $(MANDIR)/compress.1 $(MANDIR)/zcmp.1 $(MANDIR)/zmore.1
  76. Index: README
  77. 81a82,85
  78. > - There has been 1 problem report in relation to GCC 2.0 on a sparc
  79. >   workstation. GCC 2.0 seems to generate a bad compress. Use the
  80. >   standard c compiler 'cc'.
  81. > 
  82. Index: build
  83. 4c4
  84. < version="4.2.3"
  85. ---
  86. > version="4.2.4"
  87. 53c53
  88. <         echo "12.  Word must start at even addres: ${NOALLIGN}, Bytorder on your system: ${BYTEORDER}"
  89. ---
  90. >         echo "12.  Word must start at even addres: ${NOALLIGN}, Bytorder on your system: ${BYTEORDER} (1=msb)"
  91. 769a770,772
  92. > #    -DAMIGA=1                    Amiga support.
  93. > #    -DNOFUNCDEF=1                Disable libary function definitions in
  94. > #                                compress42.c
  95. 793,808c796,809
  96. <         [ -f ${BINDIR}/compress ] && \
  97. <             { rm -f ${BINDIR}/compress.old ; \
  98. <               mv ${BINDIR}/compress ${BINDIR}/compress.old ; }
  99. <         rm -f ${BINDIR}/uncompress ${BINDIR}/zcat
  100. <         cp compress ${BINDIR}/compress
  101. <         strip ${BINDIR}/compress
  102. <         rm -f ${BINDIR}/uncompress
  103. <         ln ${BINDIR}/compress ${BINDIR}/uncompress
  104. <         rm -f  ${BINDIR}/zcat
  105. <         ln -f ${BINDIR}/compress ${BINDIR}/zcat
  106. <         cp zcmp zdiff zmore ${BINDIR}/.
  107. <         chmod 0755 ${BINDIR}/compress ${BINDIR}/zcmp ${BINDIR}/zdiff \
  108. <                    ${BINDIR}/zmore
  109. <         cp compress.1 zcmp.1 zmore.1 ${MANDIR}/.
  110. <         chmod 0644 ${MANDIR}/compress.1 ${MANDIR}/zcmp.1 \
  111. <                    ${MANDIR}/zmore.1
  112. ---
  113. >         [ -f \$(BINDIR)/compress ] && \\
  114. >             { rm -f \$(BINDIR)/compress.old ; \\
  115. >               mv \$(BINDIR)/compress \$(BINDIR)/compress.old ; }
  116. >         rm -f \$(BINDIR)/uncompress \$(BINDIR)/zcat
  117. >         cp compress \$(BINDIR)/compress
  118. >         strip \$(BINDIR)/compress
  119. >         rm -f \$(BINDIR)/uncompress
  120. >         ln \$(BINDIR)/compress \$(BINDIR)/uncompress
  121. >         rm -f \$(BINDIR)/zcat
  122. >         ln -f \$(BINDIR)/compress \$(BINDIR)/zcat
  123. >         cp zcmp zdiff zmore \$(BINDIR)/.
  124. >         chmod 0755 \$(BINDIR)/compress \$(BINDIR)/zcmp \$(BINDIR)/zdiff \$(BINDIR)/zmore
  125. >         cp compress.1 zcmp.1 zmore.1 \$(MANDIR)/.
  126. >         chmod 0644 \$(MANDIR)/compress.1 \$(MANDIR)/zcmp.1 \$(MANDIR)/zmore.1
  127. Index: compress42.c
  128. 792c792
  129. <                         do_decomp = zcat_flg = 1;
  130. ---
  131. >                         zcat_flg = 1;
  132. 803c803
  133. <                         fprintf(stderr, "%s -r not availble (du to missing directory functions)\n", **argv);
  134. ---
  135. >                         fprintf(stderr, "%s -r not availble (du to missing directory functions)\n", *argv);
  136. 985c985
  137. <                 if (strcmp(tempname + strlen(tempname) - 2, ".Z") == 0)
  138. ---
  139. >                 if (!zcat_flg)
  140. 987,989c987,991
  141. <                       fprintf(stderr, "%s: already has .Z suffix -- no change\n", tempname);
  142. <                       return;
  143. <                 }
  144. ---
  145. >                     if (strcmp(tempname + strlen(tempname) - 2, ".Z") == 0)
  146. >                     {
  147. >                           fprintf(stderr, "%s: already has .Z suffix -- no change\n", tempname);
  148. >                           return;
  149. >                     }
  150. 991,996c993,999
  151. <                 if (infstat.st_nlink > 1 && (!force))
  152. <                 {
  153. <                       fprintf(stderr, "%s has %d other links: unchanged\n",
  154. <                                     tempname, infstat.st_nlink - 1);
  155. <                     exit_code = 1;
  156. <                       return;
  157. ---
  158. >                     if (infstat.st_nlink > 1 && (!force))
  159. >                     {
  160. >                           fprintf(stderr, "%s has %d other links: unchanged\n",
  161. >                                         tempname, infstat.st_nlink - 1);
  162. >                         exit_code = 1;
  163. >                           return;
  164. >                     }
  165. 1207,1216d1209
  166. <                     if (chmod(ofname, infstat.st_mode & 07777))        /* Copy modes */
  167. <                     {
  168. <                         fprintf(stderr, "\nchmod error (ignored) ");
  169. <                         perror(ofname);
  170. <                         exit_code = 1;
  171. <                     }
  172. < #ifndef    DOS
  173. <                     chown(ofname, infstat.st_uid, infstat.st_gid);    /* Copy ownership */
  174. < #endif
  175. < 
  176. 1226a1220,1230
  177. > #ifndef    AMIGA
  178. >                     if (chmod(ofname, infstat.st_mode & 07777))        /* Copy modes */
  179. >                     {
  180. >                         fprintf(stderr, "\nchmod error (ignored) ");
  181. >                         perror(ofname);
  182. >                         exit_code = 1;
  183. >                     }
  184. > #ifndef    DOS
  185. >                     chown(ofname, infstat.st_uid, infstat.st_gid);    /* Copy ownership */
  186. > #endif
  187. > #endif
  188. Index: patchlevel.h
  189. 1c1
  190. < static char    ident[] = "@(#)(N)compress 4.2.3";
  191. ---
  192. > static char    ident[] = "@(#)(N)compress 4.2.4";
  193.  
  194.  
  195.  
  196. exit 0 # Just in case...
  197.