JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in (cygcheck.o): Use MINGW_CXX for compilation. 

* cygcheck.cc: Just include <getopt.h> rather than cygwin version.
(pretty_id): Avoid compiler warnings.
* cygpath.cc (usage): Ditto.
This commit is contained in:
Christopher Faylor 2003-09-11 02:56:40 +00:00
parent b07b167eec
commit bd79b736d4
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2003-09-10 Christopher Faylor <cgf@redhat.com>
* Makefile.in (cygcheck.o): Use MINGW_CXX for compilation.
* cygcheck.cc: Just include <getopt.h> rather than cygwin version.
(pretty_id): Avoid compiler warnings.
* cygpath.cc (usage): Ditto.
2003-09-10 Christopher Faylor <cgf@redhat.com> 2003-09-10 Christopher Faylor <cgf@redhat.com>
* Makefile.in (MINGW_CXX): Define and use for mingw-compiled files. * Makefile.in (MINGW_CXX): Define and use for mingw-compiled files.

6
winsup/utils/Makefile.in
View File

@ -152,10 +152,10 @@ endif
cygcheck.o: cygcheck.cc cygcheck.o: cygcheck.cc
ifdef VERBOSE ifdef VERBOSE
${CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
else else
@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
${CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
endif endif
strace.o: strace.cc strace.o: strace.cc

6
winsup/utils/cygcheck.cc
View File

@ -16,9 +16,9 @@
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#include "path.h" #include "path.h"
#include <getopt.h>
#include "cygwin/include/sys/cygwin.h" #include "cygwin/include/sys/cygwin.h"
#include "cygwin/include/mntent.h" #include "cygwin/include/mntent.h"
#include "cygwin/include/getopt.h"
int verbose = 0; int verbose = 0;
int registry = 0; int registry = 0;
@ -775,7 +775,7 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
putenv (cygwin); putenv (cygwin);
char *id = cygpath ("/bin/id.exe", NULL); char *id = cygpath ("/bin/id.exe", NULL);
for (char *p = id; p = strchr (p, '/'); p++) for (char *p = id; (p = strchr (p, '/')); p++)
*p = '\\'; *p = '\\';
if (access (id, X_OK)) if (access (id, X_OK))
@ -805,7 +805,7 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
} }
printf ("\nOutput from %s (%s)\n", id, s); printf ("\nOutput from %s (%s)\n", id, s);
int szmaybe = strlen ("UID: ") + strlen (uid); size_t szmaybe = strlen ("UID: ") + strlen (uid);
if (sz < szmaybe) if (sz < szmaybe)
sz = szmaybe; sz = szmaybe;
sz += 1; sz += 1;