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

* environ.cc (dos_file_warning): Drop declaration.

Browse Source 
(ignore_case_with_glob): Ditto.
	(allow_winsymlinks): Ditto.
	(reset_com): Move definition to globals.cc.
	(struct parse_thing): Add "detect_bloda" option.
	* fhandler_serial.cc (fhandler_serial::open): Drop (incorrect)
	declaration of reset_com.
	* globals.cc (ignore_case_with_glob): Move definition into C++-only
	block.
	(dos_file_warning): Define.
	(allow_winsymlinks): Define.
	(reset_com): Define.
	(detect_bloda): Define.
	* path.cc (dos_file_warning): Drop definition here.
	(allow_winsymlinks): Drop definition here.
This commit is contained in:
Corinna Vinschen
2012-02-26 14:01:32 +00:00
parent dbf576fd86
commit b0af77452c
5 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,21 @@
2012-02-26 Corinna Vinschen <corinna@vinschen.de>
* environ.cc (dos_file_warning): Drop declaration.
(ignore_case_with_glob): Ditto.
(allow_winsymlinks): Ditto.
(reset_com): Move definition to globals.cc.
(struct parse_thing): Add "detect_bloda" option.
* fhandler_serial.cc (fhandler_serial::open): Drop (incorrect)
declaration of reset_com.
* globals.cc (ignore_case_with_glob): Move definition into C++-only
block.
(dos_file_warning): Define.
(allow_winsymlinks): Define.
(reset_com): Define.
(detect_bloda): Define.
* path.cc (dos_file_warning): Drop definition here.
(allow_winsymlinks): Drop definition here.
2012-02-26 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (LOCK_DIR_NAME_FMT): Define.

8
winsup/cygwin/environ.cc
View File

@@ -2,7 +2,7 @@
process's environment.
Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
@@ -32,11 +32,6 @@ details. */
#include "shared_info.h"
#include "ntdll.h"
extern bool dos_file_warning;
extern bool ignore_case_with_glob;
extern bool allow_winsymlinks;
bool reset_com = false;
static char **lastenviron;
/* Parse CYGWIN options */
@@ -116,6 +111,7 @@ static struct parse_thing
} values[2];
} known[] NO_COPY =
{
{"detect_bloda", {&detect_bloda}, justset, NULL, {{false}, {true}}},
{"dosfilewarning", {&dos_file_warning}, justset, NULL, {{false}, {true}}},
{"error_start", {func: error_start_init}, isfunc, NULL, {{0}, {0}}},
{"export", {&export_settings}, justset, NULL, {{false}, {true}}},

3
winsup/cygwin/fhandler_serial.cc
View File

@@ -1,7 +1,7 @@
/* fhandler_serial.cc
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2011 Red Hat, Inc.
2006, 2007, 2008, 2009, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin.
@@ -243,7 +243,6 @@ fhandler_serial::open (int flags, mode_t mode)
{
int res;
COMMTIMEOUTS to;
extern BOOL reset_com;
syscall_printf ("fhandler_serial::open (%s, %p, %p)",
get_name (), flags, mode);

8
winsup/cygwin/globals.cc
View File

@@ -1,7 +1,7 @@
/* globals.cc - Define global variables here.
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin.
@@ -53,6 +53,11 @@ int NO_COPY dynamically_loaded;
/* Some CYGWIN environment variable variables. */
bool allow_glob = true;
bool ignore_case_with_glob = false;
bool dos_file_warning = true;
bool allow_winsymlinks = false;
bool reset_com = false;
bool detect_bloda = false;
bool NO_COPY in_forkee;
@@ -157,7 +162,6 @@ extern "C"
/* threadinterface */ &_mtinterf,
/* impure_ptr */ _GLOBAL_REENT,
};
bool ignore_case_with_glob;
int _check_for_executable = true;
};

6
winsup/cygwin/path.cc
View File

@@ -73,8 +73,6 @@
#include <wchar.h>
#include <wctype.h>
bool dos_file_warning = true;
suffix_info stat_suffixes[] =
{
suffix_info ("", 1),
@@ -1452,10 +1450,6 @@ conv_path_list (const char *src, char *dst, size_t size,
/* Create a symlink from FROMPATH to TOPATH. */
/* If TRUE create symlinks as Windows shortcuts, if false create symlinks
as normal files with magic number and system bit set. */
bool allow_winsymlinks = false;
extern "C" int
symlink (const char *oldpath, const char *newpath)
{