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

* Makefile.in (strace.exe): Include mingw_getopt.o in link line.

Browse Source 
* cygcheck.cc (print_version): Update copyright.
* strace.cc (print_version): Ditto.
(main): Allow cygwin paths for -o option.
(create_child): Allow cygwin path as argv[0].
* path.cc (path.cc): Allow UNC paths.
This commit is contained in:
Christopher Faylor 2003-03-04 05:30:50 +00:00
parent c418817ed8
commit 229f2bb465
7 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2003-03-04 Christopher Faylor <cgf@redhat.com>
* Makefile.in (strace.exe): Include mingw_getopt.o in link line.
* cygcheck.cc (print_version): Update copyright.
* strace.cc (print_version): Ditto.
(main): Allow cygwin paths for -o option.
(create_child): Allow cygwin path as argv[0].
* path.cc (path.cc): Allow UNC paths.
2003-03-03 Christopher Faylor <cgf@redhat.com> 2003-03-03 Christopher Faylor <cgf@redhat.com>
* fhandler.h (fhandler_tty_slave::close): Declare new function. * fhandler.h (fhandler_tty_slave::close): Declare new function.

9
winsup/utils/ChangeLog
View File

@ -1,3 +1,12 @@
2003-03-04 Christopher Faylor <cgf@redhat.com>
* Makefile.in (strace.exe): Include mingw_getopt.o in link line.
* cygcheck.cc (print_version): Update copyright.
* strace.cc (print_version): Ditto.
(main): Allow cygwin paths for -o option.
(create_child): Allow cygwin path as argv[0].
* path.cc (path.cc): Allow UNC paths.
2003-03-01 Pierre Humblet <pierre.humblet@ieee.org> 2003-03-01 Pierre Humblet <pierre.humblet@ieee.org>
* mkpasswd.cc (main): On Win95, output both a default line and a * mkpasswd.cc (main): On Win95, output both a default line and a

6
winsup/utils/Makefile.in
View File

@ -81,12 +81,12 @@ endif
all: Makefile $(PROGS) all: Makefile $(PROGS)
strace.exe: strace.o mingw_getopt.o $(MINGW_DEP_LDLIBS) strace.exe: strace.o path.o mingw_getopt.o $(MINGW_DEP_LDLIBS)
ifdef VERBOSE ifdef VERBOSE
$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
else else
@echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\ @echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
endif endif
cygcheck.exe: cygcheck.o mingw_getopt.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) cygcheck.exe: cygcheck.o mingw_getopt.o path.o dump_setup.o $(MINGW_DEP_LDLIBS)

2
winsup/utils/cygcheck.cc
View File

@ -1353,7 +1353,7 @@ print_version ()
printf ("\ printf ("\
cygcheck version %.*s\n\ cygcheck version %.*s\n\
System Checker for Cygwin\n\ System Checker for Cygwin\n\
Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\ Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.\n\
Compiled on %s\n\ Compiled on %s\n\
", len, v, __DATE__); ", len, v, __DATE__);
} }

2
winsup/utils/path.cc
View File

@ -245,7 +245,7 @@ vconcat (const char *s, va_list v)
else if (*p == '/' || *p == '\\') else if (*p == '/' || *p == '\\')
{ {
if (p == rv && unc) if (p == rv && unc)
p++; *d++ = *p++;
while (p[1] == '/') while (p[1] == '/')
p++; p++;
} }

4
winsup/utils/path.h
View File

@ -1,6 +1,6 @@
/* path.h /* path.h
Copyright 2001 Red Hat, Inc. Copyright 2001, 2002, 2003 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -8,4 +8,4 @@ This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */ details. */
char * cygpath (const char *s, ...); char *cygpath (const char *s, ...);

8
winsup/utils/strace.cc
View File

@ -1,6 +1,6 @@
/* strace.cc /* strace.cc
Copyright 2000, 2001, 2002 Red Hat Inc. Copyright 2000, 2001, 2002, 2003 Red Hat Inc.
Written by Chris Faylor <cgf@redhat.com> Written by Chris Faylor <cgf@redhat.com>
@ -23,6 +23,7 @@ details. */
#include <errno.h> #include <errno.h>
#include "cygwin/include/sys/strace.h" #include "cygwin/include/sys/strace.h"
#include "cygwin/include/sys/cygwin.h" #include "cygwin/include/sys/cygwin.h"
#include "path.h"
#undef cygwin_internal #undef cygwin_internal
/* GCC runtime library's C++ EH code unfortunately pulls in stdio, and we /* GCC runtime library's C++ EH code unfortunately pulls in stdio, and we
@ -309,6 +310,7 @@ create_child (char **argv)
BOOL ret; BOOL ret;
DWORD flags; DWORD flags;
*argv = cygpath (*argv, NULL);
memset (&si, 0, sizeof (si)); memset (&si, 0, sizeof (si));
si.cb = sizeof (si); si.cb = sizeof (si);
@ -886,7 +888,7 @@ print_version ()
printf ("\ printf ("\
%s (cygwin) %.*s\n\ %s (cygwin) %.*s\n\
System Trace\n\ System Trace\n\
Copyright 2000, 2001, 2002 Red Hat, Inc.\n\ Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.\n\
Compiled on %s\n\ Compiled on %s\n\
", pgm, len, v, __DATE__); ", pgm, len, v, __DATE__);
} }
@ -937,7 +939,7 @@ character #%d.\n", optarg, (int) (endptr - optarg), endptr);
numerror ^= 1; numerror ^= 1;
break; break;
case 'o': case 'o':
if ((ofile = fopen (optarg, "w")) == NULL) if ((ofile = fopen (cygpath (optarg, NULL), "w")) == NULL)
error (1, "can't open %s", optarg); error (1, "can't open %s", optarg);
#ifdef F_SETFD #ifdef F_SETFD
(void) fcntl (fileno (ofile), F_SETFD, 0); (void) fcntl (fileno (ofile), F_SETFD, 0);