From: Charles Wilson Date: Sun, 5 Feb 2012 20:29:51 +0000 (+0000) Subject: Remove ascii in deference to new (external) package X-Git-Tag: v1_4_8~2 X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=2870c9ecc3cf26bf5c6a515d176f172de59a39af;p=cygwin-apps%2Fcygutils.git Remove ascii in deference to new (external) package --- diff --git a/ChangeLog b/ChangeLog index 7bcb97f..4147a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-10-30 Yaakov Selkowitz + + Remove ascii in deference to new (external) package. + * Makefile.am: Remove mentions of ascii. + * PROGLIST: Ditto. + * README: Ditto. + * NEWS: Update. + * src/ascii/ascii.c: Remove. + 2011-10-27 Yaakov Selkowitz Integrate cygstart with FD.o menu and mimetype system. diff --git a/Makefile.am b/Makefile.am index 83f0bec..b018e48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ if WITH_CYGWIN_SPECIFIC_PROGRAMS cygwin_specific_progs = src/cygdrop/cygdrop endif -bin_PROGRAMS = src/ascii/ascii $(windows_progs) src/conv/conv \ +bin_PROGRAMS = $(windows_progs) src/conv/conv \ src/dump/dump $(ipc_progs) \ src/realpath/realpath $(cygwin_specific_progs) @@ -112,7 +112,6 @@ DISTCLEANFILES = \ po/remove-potcdate.sed \ src/cygicons/cygicons.rc -src_ascii_ascii_LDADD = -lpopt src_banner_banner_LDADD = -lpopt -lkernel32 -lgdi32 src_clip_getclip_LDADD = -lpopt src_clip_putclip_LDADD = -lpopt diff --git a/NEWS b/NEWS index 8571f50..47f6eea 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ 1.4.8 * Integrate cygstart with FD.o menu and mimetype system. (Yaakov Selkowitz) + * Remove ascii utility; replaced by separate package derived + from ESR's implementation http://catb.org/~esr/ascii/ 1.4.6 * conv: no longer distribute as dos2unix, unix2dos, u2d, or d2u. diff --git a/PROGLIST b/PROGLIST index 0110401..51dfb67 100644 --- a/PROGLIST +++ b/PROGLIST @@ -1,7 +1,3 @@ -ascii.exe - dumps the 256 ascii characters to stdout - using a nice format (GPLv3+) - dump.exe [file] hex dump of file to stdout, using a nice format (GPLv3+) diff --git a/README b/README index f01d763..e87d9fc 100644 --- a/README +++ b/README @@ -47,8 +47,8 @@ files included in this package that fall under his edict. What's in this package: ------------------------------- GPLv3+: - ascii banner cygdrop cygicons.dll cygstart - dump lpr mkshortcut readshortcut realpath + banner cygdrop cygicons.dll cygstart dump + lpr mkshortcut readshortcut realpath Clipboard: putclip getclip diff --git a/src/ascii/ascii.c b/src/ascii/ascii.c deleted file mode 100755 index 1d8dc68..0000000 --- a/src/ascii/ascii.c +++ /dev/null @@ -1,230 +0,0 @@ -/** - * ascii.c ASCII table display - * - * Copyright 2001,2002,2009 by Charles Wilson - * All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * See the COPYING file for full license information. - */ - -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include "common.h" - -static const char versionID[] = PACKAGE_VERSION; -static const char revID[] = - "$Id$"; -static const char copyrightID[] = - "Copyright (c) 2010\nCharles S. Wilson. All rights reserved.\nLicensed under GPLv3+\n"; - -static void printTopDescription (FILE * f, char *name); -static const char *getVersion (void); -static void usage (FILE * f, char *name); -static void help (FILE * f, char *name); -static void version (FILE * f, char *name); -static void license (FILE * f, char *name); -static void ascii (FILE * f, int opt_extended); - -static char *program_name; -static poptContext optCon; - -int -main (int argc, const char **argv) -{ - const char **rest; - int rc; - int ec = 0; - int opt_extended = 0; - - struct poptOption generalOptionsTable[] = { - {"extended", 'e', POPT_ARG_NONE, NULL, 'e', - "Include \"hi-ascii\" characters (128..255).", NULL}, - {NULL, '\0', 0, NULL, 0, NULL, NULL} - }; - - struct poptOption helpOptionsTable[] = { - {"help", '?', POPT_ARG_NONE, NULL, '?', - "Show this help message", NULL}, - {"usage", '\0', POPT_ARG_NONE, NULL, 'u', - "Display brief usage message", NULL}, - {"version", '\0', POPT_ARG_NONE, NULL, 'v', - "Display version information", NULL}, - {"license", '\0', POPT_ARG_NONE, NULL, 'l', - "Display licensing information", NULL}, - {NULL, '\0', 0, NULL, 0, NULL, NULL} - }; - - struct poptOption opt[] = { - {NULL, '\0', POPT_ARG_INCLUDE_TABLE, generalOptionsTable, 0, - "General options", NULL}, - {NULL, '\0', POPT_ARG_INCLUDE_TABLE, helpOptionsTable, 0, - "Help options", NULL}, - {NULL, '\0', 0, NULL, 0, NULL, NULL} - }; - - if ((program_name = strdup (argv[0])) == NULL) - { - fprintf (stderr, "%s: memory allocation error\n", argv[0]); - exit (1); - } - optCon = poptGetContext (NULL, argc, argv, opt, 0); - - while ((rc = poptGetNextOpt (optCon)) > 0) - { - switch (rc) - { - case 'e': - opt_extended=1; - break; - case '?': - help (stdout, program_name); - goto exit; - case 'u': - usage (stdout, program_name); - goto exit; - case 'v': - version (stdout, program_name); - goto exit; - case 'l': - license (stdout, program_name); - goto exit; - } - } - if (rc < -1) - { - fprintf (stderr, "%s: bad argument %s: %s\n", - program_name, poptBadOption (optCon, POPT_BADOPTION_NOALIAS), - poptStrerror (rc)); - ec = 2; - goto exit; - } - rest = poptGetArgs (optCon); - - if (rest == NULL) - ascii (stdout, opt_extended); - else - { - fprintf (stderr, "Extra args ignored: "); - while (*rest) - fprintf (stderr, "%s ", *rest++); - fprintf (stderr, "\n"); - ascii (stdout, opt_extended); - } - -exit: - poptFreeContext (optCon); - free (program_name); - return (ec); -} - -static const char * -getVersion () -{ - return versionID; -} - -static void -printTopDescription (FILE * f, char *name) -{ - fprintf (f, "%s is part of cygutils version %s\n", name, getVersion ()); - fprintf (f, - " Prints nicely formatted table of the ascii character set\n\n"); -} - -static -printLicense (FILE * f, char *name) -{ - fprintf (f, - "This program is free software: you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation, either version 3 of the License, or\n" - "(at your option) any later version.\n\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see .\n\n" - "See the COPYING file for full license information.\n"); -} - -static void -usage (FILE * f, char *name) -{ - poptPrintUsage (optCon, f, 0); -} - -static void -help (FILE * f, char *name) -{ - printTopDescription (f, name); - poptPrintHelp (optCon, f, 0); -} - -static void -version (FILE * f, char *name) -{ - printTopDescription (f, name); -} - -static void -license (FILE * f, char *name) -{ - printTopDescription (f, name); - printLicense (f, name); -} - -static void -ascii (FILE * f, int opt_extended) -{ - char str1[64][80]; - int i, j; - int c; - - for (i = 0; i < 64; i++) - str1[i][0] = '\0'; - - for (i = 0; i < 128; i++) - { - j = i % 32; - sprintf (str1[j], "%s%03d %0#4x ", str1[j], i, i); - if (i < 32) - sprintf (str1[j], "%s^%c\t", str1[j], i + 64); - else - sprintf (str1[j], "%s%c\t", str1[j], i); - } - if (opt_extended) - { - for (i = 128; i < 256; i++) - { - j = ((i - 128) % 32) + 32; - sprintf (str1[j], "%s%03d %0#4x ", str1[j], i, i); - sprintf (str1[j], "%s%c\t", str1[j], i); - } - } - for (i = 0; i < 32; i++) - fprintf (f, "%s\n", str1[i]); - - if (opt_extended) - { - fprintf (f, "\n"); - for (i = 32; i < 64; i++) - fprintf (f, "%s\n", str1[i]); - } -} -