From 229f2bb465857664fcff62336e92166d1a9f7667 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 4 Mar 2003 05:30:50 +0000 Subject: [PATCH] * 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. --- winsup/cygwin/ChangeLog | 9 +++++++++ winsup/utils/ChangeLog | 9 +++++++++ winsup/utils/Makefile.in | 6 +++--- winsup/utils/cygcheck.cc | 2 +- winsup/utils/path.cc | 2 +- winsup/utils/path.h | 4 ++-- winsup/utils/strace.cc | 8 +++++--- 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ca80ac023..ccda89ac6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,12 @@ +2003-03-04 Christopher Faylor + + * 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 * fhandler.h (fhandler_tty_slave::close): Declare new function. diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 01e94d099..8c63b702d 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,12 @@ +2003-03-04 Christopher Faylor + + * 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 * mkpasswd.cc (main): On Win95, output both a default line and a diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 0c4e5bc3b..6c5e46745 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -81,12 +81,12 @@ endif 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 - $(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 @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 cygcheck.exe: cygcheck.o mingw_getopt.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index b4cb93d00..96bf35024 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -1353,7 +1353,7 @@ print_version () printf ("\ cygcheck version %.*s\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\ ", len, v, __DATE__); } diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc index af957411c..e985384ce 100644 --- a/winsup/utils/path.cc +++ b/winsup/utils/path.cc @@ -245,7 +245,7 @@ vconcat (const char *s, va_list v) else if (*p == '/' || *p == '\\') { if (p == rv && unc) - p++; + *d++ = *p++; while (p[1] == '/') p++; } diff --git a/winsup/utils/path.h b/winsup/utils/path.h index 0512a55dd..bfc3c699e 100644 --- a/winsup/utils/path.h +++ b/winsup/utils/path.h @@ -1,6 +1,6 @@ /* path.h - Copyright 2001 Red Hat, Inc. + Copyright 2001, 2002, 2003 Red Hat, Inc. 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 details. */ -char * cygpath (const char *s, ...); +char *cygpath (const char *s, ...); diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc index 26ffa4737..861c7ff2d 100644 --- a/winsup/utils/strace.cc +++ b/winsup/utils/strace.cc @@ -1,6 +1,6 @@ /* strace.cc - Copyright 2000, 2001, 2002 Red Hat Inc. + Copyright 2000, 2001, 2002, 2003 Red Hat Inc. Written by Chris Faylor @@ -23,6 +23,7 @@ details. */ #include #include "cygwin/include/sys/strace.h" #include "cygwin/include/sys/cygwin.h" +#include "path.h" #undef cygwin_internal /* GCC runtime library's C++ EH code unfortunately pulls in stdio, and we @@ -309,6 +310,7 @@ create_child (char **argv) BOOL ret; DWORD flags; + *argv = cygpath (*argv, NULL); memset (&si, 0, sizeof (si)); si.cb = sizeof (si); @@ -886,7 +888,7 @@ print_version () printf ("\ %s (cygwin) %.*s\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\ ", pgm, len, v, __DATE__); } @@ -937,7 +939,7 @@ character #%d.\n", optarg, (int) (endptr - optarg), endptr); numerror ^= 1; break; case 'o': - if ((ofile = fopen (optarg, "w")) == NULL) + if ((ofile = fopen (cygpath (optarg, NULL), "w")) == NULL) error (1, "can't open %s", optarg); #ifdef F_SETFD (void) fcntl (fileno (ofile), F_SETFD, 0);