eolfix-cvs Mailing List for eolfix: report/change EOL characters
Brought to you by:
rossta
Menu
▾
▴
eolfix-cvs — CVS commits
You can subscribe to this list here.
| 2006 |
Jan
(11) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Ross S. <ro...@us...> - 2006-03-21 16:28:39
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5957 Modified Files: eolfix.dsp Added Files: eolfix.gif eolfix.ico eolfix.rc Log Message: Added .ico, and version information to eolfix.rc Index: eolfix.dsp =================================================================== RCS file: /cvsroot/eolfix/eolfix/eolfix.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- eolfix.dsp 4 Jan 2006 10:58:05 -0000 1.1.1.1 +++ eolfix.dsp 21 Mar 2006 16:28:29 -0000 1.2 @@ -121,6 +121,10 @@ # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\eolfix.rc +# End Source File # End Group # End Target # End Project --- NEW FILE: eolfix.rc --- //Microsoft Developer Studio generated resource script. // #include "windows.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // Neutral resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) #ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // Icon & Bitmaps // IDI_ICON ICON DISCARDABLE "eolfix.ico" #ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO FILEVERSION 0,2,0,0 PRODUCTVERSION 0,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif FILEOS 0x40004L FILETYPE 0x1L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "000004b0" BEGIN VALUE "FileDescription", "View and Correct EOL characters\0" VALUE "FileVersion", "0, 2, 0, 0\0" VALUE "InternalName", "eolfix\0" VALUE "LegalCopyright", "Copyright © 2005-2006 Ross Smith\0" VALUE "OriginalFilename", "eolfix.exe\0" VALUE "ProductName", "View and Correct EOL characters\0" VALUE "ProductVersion", "1, 0, 0, 0\0" END END BLOCK "VarFileInfo" BEGIN VALUE "Translation", 0x0, 1200 END END #endif // !_MAC #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // 1 TEXTINCLUDE DISCARDABLE BEGIN "windows.h\0" END 2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END 3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" "\0" END #endif // APSTUDIO_INVOKED #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED --- NEW FILE: eolfix.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: eolfix.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Ross S. <ro...@us...> - 2006-03-21 16:27:13
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5123 Modified Files: configure.ac eolfix.c version.h Log Message: Added .ico, fixed 'cannot open : No such file or directory' bug, fixed command line parsing bug, bumped version to 0.2.0 Index: eolfix.c =================================================================== RCS file: /cvsroot/eolfix/eolfix/eolfix.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- eolfix.c 6 Jan 2006 21:30:26 -0000 1.4 +++ eolfix.c 21 Mar 2006 16:26:57 -0000 1.5 @@ -764,7 +764,26 @@ /****************************************************************************/ /* per http://www.scit.wlv.ac.uk/cgi-bin/mansec?3C+dirname */ -static char* dirname(char* s) { +static char* dirname(char* path) { + char *p; + + if (path == NULL || *path == '\0') + return "."; + p = path + strlen(path) - 1; + while (IS_PATH_SEPARATOR(*p)) { + if (p == path) + return path; + *p-- = '\0'; + } + + while (p >= path && !IS_PATH_SEPARATOR(*p)) + p--; + + return + p < path ? "." : + p == path ? "/" : + (*p = '\0', path); +/* int i; static char rv[PATH_MAX]; int at_end = 1; @@ -776,7 +795,7 @@ if (i > 0) { if (i > PATH_MAX - 1) return NULL; - strncpy(rv, s, i - 1); + strncpy(rv, s, i); } rv[i] = '\0'; return rv; @@ -786,7 +805,8 @@ } } - return "."; + return "."; +*/ } #define HAVE_DIRNAME 1 @@ -2229,18 +2249,18 @@ static int process_options(List **file_list, int argc, char **argv) { int last_optind = 0; - + int c = 0; + /* turn off getopt's error messages */ opterr = 0; optind = 1; optreset = 1; while (optind < argc) { - int c; int option_index = 0; - if (optind <= last_optind) - optind = last_optind + 1; +// if (optind <= last_optind) +// optind = last_optind + 1; if (optind >= argc) break; @@ -2248,6 +2268,11 @@ if (last_optind < optind) last_optind = optind; +#if defined(__WINDOWS__) + if (optind < argc && argv[optind] && argv[optind][0] == '/') + argv[optind][0] = '-'; +#endif + c = getopt_long(argc, argv, short_options, long_options, &option_index); if (c <= 1) { @@ -2258,7 +2283,8 @@ } break; } - process_filename(file_list, argv[last_optind]); + process_filename(file_list, argv[last_optind]); + ++optind; continue; } @@ -2553,6 +2579,10 @@ int main(int argc, char **argv) { List *file_list = NULL; +#ifdef SIGABRT + if (signal(SIGABRT, SIG_IGN) != SIG_IGN) + signal(SIGABRT, sighandler); +#endif #ifdef SIGHUP if (signal(SIGHUP, SIG_IGN) != SIG_IGN) signal(SIGHUP, sighandler); Index: configure.ac =================================================================== RCS file: /cvsroot/eolfix/eolfix/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- configure.ac 4 Jan 2006 11:44:57 -0000 1.2 +++ configure.ac 21 Mar 2006 16:26:57 -0000 1.3 @@ -3,11 +3,11 @@ dnl $Id$ MAJOR_VERSION=0 -MINOR_VERSION=1 +MINOR_VERSION=2 RELEASE_NUMBER=0 SUBRELEASE_NUMBER=0 -AC_INIT(eolfix, 0.1.0, [ro...@us...]) +AC_INIT(eolfix, 0.2.0, [ro...@us...]) AC_CONFIG_SRCDIR([eolfix.c]) Index: version.h =================================================================== RCS file: /cvsroot/eolfix/eolfix/version.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- version.h 4 Jan 2006 11:44:57 -0000 1.2 +++ version.h 21 Mar 2006 16:26:57 -0000 1.3 @@ -14,7 +14,7 @@ #define PACKAGE "eolfix" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.1.0" +#define PACKAGE_VERSION "0.2.0" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "ro...@us..." |
|
From: Ross S. <ro...@us...> - 2006-01-10 21:59:05
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16598 Modified Files: djgpp.mak mingw.mak Log Message: make file fixes Index: djgpp.mak =================================================================== RCS file: /cvsroot/eolfix/eolfix/djgpp.mak,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- djgpp.mak 6 Jan 2006 20:53:55 -0000 1.3 +++ djgpp.mak 10 Jan 2006 21:58:56 -0000 1.4 @@ -5,7 +5,7 @@ ifneq ('$(DEBUG)', '') CFLAGS+=-O0 -g -D_DEBUG else -CFLAGS+=-02 -DNDEBUG +CFLAGS+=-O2 -DNDEBUG endif OBJS=eolfix.o fnmatch.o getopt.o Index: mingw.mak =================================================================== RCS file: /cvsroot/eolfix/eolfix/mingw.mak,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mingw.mak 6 Jan 2006 20:53:55 -0000 1.3 +++ mingw.mak 10 Jan 2006 21:58:56 -0000 1.4 @@ -5,7 +5,7 @@ ifneq ('$(DEBUG)', '') CFLAGS+=-O0 -g -D_DEBUG else -CFLAGS+=-02 -DNDEBUG +CFLAGS+=-O2 -DNDEBUG endif OBJS=eolfix.o fnmatch.o # getopt.o |
|
From: Ross S. <ro...@us...> - 2006-01-06 21:31:10
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28490 Added Files: THANKS TODO Log Message: Added TODO and THANKS --- NEW FILE: TODO --- $Id: TODO,v 1.1 2006/01/06 21:30:59 rossta Exp $ See the beginning of eolfix.c for details. --- NEW FILE: THANKS --- $Id: THANKS,v 1.1 2006/01/06 21:30:59 rossta Exp $ |
|
From: Ross S. <ro...@us...> - 2006-01-06 21:30:38
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28366 Modified Files: eolfix.c Log Message: Added debian build files (untested) Index: eolfix.c =================================================================== RCS file: /cvsroot/eolfix/eolfix/eolfix.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- eolfix.c 6 Jan 2006 20:53:17 -0000 1.3 +++ eolfix.c 6 Jan 2006 21:30:26 -0000 1.4 @@ -14,7 +14,14 @@ It detects binary files in a nearly foolproof way and leaves them alone unless you override this. It will also leave files alone that are already in the right format and preserves file timestamps. User interrupts are handled gracefully and no garbage or corrupted files left behind. -'flip' does not convert files to a different character set, and it can not handle Apple Macintosh line endings (CR only). For that (and more), you can use the 'recode' program (package 'recode'). +'flip' does not convert files to a different character set, and it can not handle Apple Macintosh line endings (CR only). + For that (and more), you can use the 'recode' program (package 'recode'). + +Command line utility to report, and optionally convert, the line endings of text files between MS-DOS, Unix and Macintosh formats. +It detects and ignores binary files unless instructed to include them. +It does not modify files if the file is already in the requested format. +It properly handles "mixed" format files (files having more than one type of line ending format). +It does not, currently, handle character encodings other than 7-bit ASCII. fix: eolfix -v -s *.c -l *.c |
Update of /cvsroot/eolfix/eolfix/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28366/debian Added Files: README.Debian changelog compat control copyright dirs docs email.substvars files rules watch Log Message: Added debian build files (untested) --- NEW FILE: files --- eolfix_0.1.1-1_i386.deb text optional --- NEW FILE: dirs --- usr/bin usr/share/man usr/share/doc --- NEW FILE: copyright --- This package was debianized by Ross Smith <ro...@us...> on Fri, 06 Jan 2006 00:00:00 +0000. It was downloaded from http://eolfix.sf.net/ Upstream Author: Ross Smith <ro...@us...> Copyright: Copyright (c) 2002-2006, Ross Smith. All Rights Reserved --- NEW FILE: changelog --- $Id: changelog,v 1.1 2006/01/06 21:30:27 rossta Exp $ eolfix (0.1.1-1) unstable; urgency=low * New upstream release -- Ross Smith II <ro...@us...> Fri, 06 Jan 2006 00:00:00 +0000 --- NEW FILE: rules --- #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif config.status: configure dh_testdir # Add here commands to configure the package. ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --bindir=\$${prefix}/usr/bin --mandir=\$${prefix}/usr/share/man \ --sysconfdir=\$${prefix}/etc --docdir=\$${prefix}/usr/share/doc build: build-stamp build-stamp: config.status dh_testdir # Add here commands to compile the package. $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/eolfix. $(MAKE) install prefix=$(CURDIR)/debian/eolfix # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs dh_installexamples # dh_install # dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron # dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms # dh_perl # dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install --- NEW FILE: docs --- AUTHORS ChangeLog NEWS README TODO THANKS --- NEW FILE: compat --- 4 4 --- NEW FILE: watch --- # Example watch control file for uscan # Rename this file to "watch" and then you can run the "uscan" command # to check for upstream updates and more. # Site Directory Pattern Version Script version=2 sourceforge.net /project/showfiles.php?group_id=146787 eolfix-(.*)\.tar\.gz debian uupdate --- NEW FILE: email.substvars --- shlibs:Depends=libc6 (>= 2.2.4-4) --- NEW FILE: control --- Source: eolfix Section: text Priority: optional Maintainer: Ross Smith (ro...@us...) Build-Depends: debhelper (>> 4.0.0) Standards-Version: 3.5.8 Package: eolfix Architecture: any Description: Command line utility to report, and optionally convert, the line endings of text files between MS-DOS, Unix and Macintosh formats. It detects and ignores binary files unless instructed to include them. It does not modify files if the file is already in the requested format. It properly handles "mixed" format files (files having more than one type of line ending format). --- NEW FILE: README.Debian --- eolfix for Debian ---------------- |
|
From: Ross S. <ro...@us...> - 2006-01-06 21:29:46
|
Update of /cvsroot/eolfix/eolfix/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28107/debian Log Message: Directory /cvsroot/eolfix/eolfix/debian added to the repository |
|
From: Ross S. <ro...@us...> - 2006-01-06 20:54:04
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19244 Modified Files: djgpp.mak makedist-win32.sh mingw.mak Log Message: Corrected gcc params for djgpp and mingw Index: makedist-win32.sh =================================================================== RCS file: /cvsroot/eolfix/eolfix/makedist-win32.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- makedist-win32.sh 4 Jan 2006 11:44:57 -0000 1.2 +++ makedist-win32.sh 6 Jan 2006 20:53:55 -0000 1.3 @@ -2,7 +2,9 @@ # $Id$ -VERSION=0.1.0 +# Cygwin shell script to create Win32 binary & source distributions + +VERSION=`cat version` FILES="\ AUTHORS \ @@ -27,11 +29,20 @@ *.h \ *.mak \ makedist-win32.sh \ +-x config.h \ " +ZIP="zip -j -9" + +rm -f \ +eolfix-${VERSION}-win32.zip \ +eolfix-${VERSION}-src-win32.zip + # upx Release/eolfix.exe -zip -j -9 eolfix-${VERSION}-win32.zip ${FILES} +${ZIP} eolfix-${VERSION}-win32.zip ${FILES} -rm -f config.h +# test -f config.h && mv -f config.h config.h.sav -zip -j -9 eolfix-${VERSION}-src-win32.zip ${SRC_FILES} +${ZIP} eolfix-${VERSION}-src-win32.zip ${SRC_FILES} + +# test -f config.h.sav && mv -f config.h.sav config.h Index: djgpp.mak =================================================================== RCS file: /cvsroot/eolfix/eolfix/djgpp.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- djgpp.mak 4 Jan 2006 11:44:57 -0000 1.2 +++ djgpp.mak 6 Jan 2006 20:53:55 -0000 1.3 @@ -3,9 +3,9 @@ # $Id$ ifneq ('$(DEBUG)', '') -CFLAGS+=-D_DEBUG +CFLAGS+=-O0 -g -D_DEBUG else -CFLAGS+=-DNDEBUG +CFLAGS+=-02 -DNDEBUG endif OBJS=eolfix.o fnmatch.o getopt.o Index: mingw.mak =================================================================== RCS file: /cvsroot/eolfix/eolfix/mingw.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mingw.mak 4 Jan 2006 11:44:57 -0000 1.2 +++ mingw.mak 6 Jan 2006 20:53:55 -0000 1.3 @@ -3,9 +3,9 @@ # $Id$ ifneq ('$(DEBUG)', '') -CFLAGS+=-D_DEBUG +CFLAGS+=-O0 -g -D_DEBUG else -CFLAGS+=-DNDEBUG +CFLAGS+=-02 -DNDEBUG endif OBJS=eolfix.o fnmatch.o # getopt.o |
|
From: Ross S. <ro...@us...> - 2006-01-06 20:53:25
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18997 Modified Files: eolfix.c Log Message: Fixed signal handling Index: eolfix.c =================================================================== RCS file: /cvsroot/eolfix/eolfix/eolfix.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- eolfix.c 4 Jan 2006 11:44:09 -0000 1.2 +++ eolfix.c 6 Jan 2006 20:53:17 -0000 1.3 @@ -7,6 +7,15 @@ TODO ==== +http://packages.debian.org/stable/text/flip + +flip +This program converts line endings of text files between MS-DOS and **IX formats. +It detects binary files in a nearly foolproof way and leaves them alone unless you override this. +It will also leave files alone that are already in the right format and preserves file timestamps. +User interrupts are handled gracefully and no garbage or corrupted files left behind. +'flip' does not convert files to a different character set, and it can not handle Apple Macintosh line endings (CR only). For that (and more), you can use the 'recode' program (package 'recode'). + fix: eolfix -v -s *.c -l *.c support runon options: eolfix -vib -d @@ -2537,10 +2546,26 @@ int main(int argc, char **argv) { List *file_list = NULL; - if (signal(SIGINT, sighandler) == SIG_IGN) - signal(SIGINT, SIG_IGN); - if (signal(SIGTERM, sighandler) == SIG_IGN) - signal(SIGTERM, SIG_IGN); +#ifdef SIGHUP + if (signal(SIGHUP, SIG_IGN) != SIG_IGN) + signal(SIGHUP, sighandler); +#endif +#ifdef SIGINT + if (signal(SIGINT, SIG_IGN) != SIG_IGN) + signal(SIGINT, sighandler); +#endif +#ifdef SIGPIPE + if (signal(SIGPIPE, SIG_IGN) != SIG_IGN) + signal(SIGPIPE, sighandler); +#endif +#ifdef SIGQUIT + if (signal(SIGQUIT, SIG_IGN) != SIG_IGN) + signal(SIGQUIT, sighandler); +#endif +#ifdef SIGTERM + if (signal(SIGTERM, SIG_IGN) != SIG_IGN) + signal(SIGTERM, sighandler); +#endif progname = basename(argv[0]); |
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12710 Modified Files: AUTHORS ChangeLog Makefile.am NEWS README autogen.sh bcc55.cmd cleanall.cmd compiler.h config.cmd configure.ac cygwin.cmd djgpp.cmd djgpp.mak dm.cmd dm.mak fnmatch.c fnmatch.h getopt.c getopt.h helpall.cmd intel.cmd intel.mak lcc.cmd lcc.mak makeall.cmd makedist-win32.sh mingw.cmd mingw.mak msvc6.cmd msvc6.mak msvc7.cmd msvc7.mak msvc8.cmd msvc8.mak platform.h runall.cmd version.h watcom.cmd watcom.mak Log Message: Updating any out-of-date-files |
|
From: Ross S. <ro...@us...> - 2006-01-04 11:44:20
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12538 Modified Files: eolfix.c Log Message: Cleaned up ignore_case logic Index: eolfix.c =================================================================== RCS file: /cvsroot/eolfix/eolfix/eolfix.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- eolfix.c 4 Jan 2006 10:58:05 -0000 1.1.1.1 +++ eolfix.c 4 Jan 2006 11:44:09 -0000 1.2 @@ -385,7 +385,7 @@ bool recursive; char temp_dir[PATH_MAX]; int verbose; - int ignore_case; + bool ignore_case; bool std_in; bool std_out; @@ -416,8 +416,11 @@ false, /* recursive */ "", /* temp_dir */ 0, /* verbose */ - -1, /* ignore_case (-1 == undefined) */ - +#ifdef IS_CASE_INSENSITIVE_FILESYSTEM + true, /* ignore_case */ +#else + false, +#endif false, /* stdin */ false, /* stdout */ false, /* wildcard_found */ @@ -1461,7 +1464,6 @@ char *p; void *data; List *node = *head; - int (__cdecl *)(const void *, const void *) strcmp_ptr; if (dont_alloc) p = filespec; @@ -1473,16 +1475,17 @@ opt.wildcards_used = true; } -#ifdef IS_CASE_INSENSITIVE_FILESYSTEM -# define FILENAME_COMPARE stricmp -#else -# define FILENAME_COMPARE strcmp -#endif - while (node) { File *data = (File *) node->data; - - if (FILENAME_COMPARE(data->filespec, filespec) == 0) { + bool filespecs_equal; + + if (opt.ignore_case) { + filespecs_equal = stricmp(data->filespec, filespec) == 0; + } else { + filespecs_equal = strcmp(data->filespec, filespec) == 0; + } + + if (filespecs_equal) { /* free(data->filespec); */ data->filespec = p; data->include = include; @@ -1828,18 +1831,10 @@ return 1; } - switch (opt.ignore_case) { - case 0: /* false */ - fnmatch_flags &= ~FNM_CASEFOLD; - break; - case 1: /* true */ - fnmatch_flags |= FNM_CASEFOLD; - break; - default: /* undefined (-1) */ -#ifdef IS_CASE_INSENSITIVE_FILESYSTEM - fnmatch_flags |= FNM_CASEFOLD; -#endif - break; + if (opt.ignore_case) { + fnmatch_flags |= FNM_CASEFOLD; + } else { + fnmatch_flags &= ~FNM_CASEFOLD; } for (;;) { @@ -2425,7 +2420,7 @@ opt.dry_run = true; break; case 'z': /* --ignore_case */ - opt.ignore_case = 1; + opt.ignore_case = true; break; case '?': /* --help */ if (optopt != '?') { @@ -2487,7 +2482,7 @@ opt.dry_run = false; break; case 'Z': /* --no-ignore_case */ - opt.ignore_case = 0; + opt.ignore_case = false; break; #ifdef CONV_SUPPORT_ENABLED case OPT_AUTO: /* --auto */ |
|
From: Ross S. <ro...@us...> - 2006-01-04 11:41:09
|
Update of /cvsroot/eolfix/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12021 Modified Files: loginfo Log Message: Removed my email address Index: loginfo =================================================================== RCS file: /cvsroot/eolfix/CVSROOT/loginfo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- loginfo 4 Jan 2006 10:55:49 -0000 1.2 +++ loginfo 4 Jan 2006 11:40:52 -0000 1.3 @@ -26,6 +26,6 @@ # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -CVSROOT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -q -u %{sVv} eol...@li... ro...@us... +CVSROOT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -q -u %{sVv} eol...@li... -DEFAULT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -q -u %{sVv} eol...@li... ro...@us... +DEFAULT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -q -u %{sVv} eol...@li... |
|
From: Ross S. <ro...@us...> - 2006-01-04 11:37:34
|
Update of /cvsroot/eolfix/eolfix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11098 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvsroot/eolfix/eolfix/.cvsignore,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- .cvsignore 4 Jan 2006 10:58:04 -0000 1.1.1.1 +++ .cvsignore 4 Jan 2006 11:36:06 -0000 1.2 @@ -1,4 +1,5 @@ eolfix +eolfix-*.*.* eolfix-*.tar.gz eolfix-*.zip eolfix-*.bz2 |
