libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-01 12:00:35 +08:00
Code Issues Projects Releases Wiki Activity

* devices.h (device::exists_func): Redefine field.

Browse Source 
(device::dev_on_fs): Remove unneeded bit field.  Just make a normal boolean.
(device::exists): Redefine function.
* devices.in: Move previous functions earlier since they are now only defined
static.  Rename some functions due to an as-yet unresolved bug in gendevices.
Rename posix part of internal-only devices with a double-slash.  gendevices
will eventuall translate that to a ":".
(device::parse): Rework to use dev pointer and dev_storage_end.
* devices.cc: Regenerate.
* gendevices: Translate "// to ": after shilka processing.
This commit is contained in:
Christopher Faylor 2012-04-01 07:19:52 +00:00
parent e2e887c5ac
commit 727a81f4d9
6 changed files with 11450 additions and 12259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,17 @@
2012-03-31 Christopher Faylor <me.cygwin2012@cgf.cx>
* devices.h (device::exists_func): Redefine field.
(device::dev_on_fs): Remove unneeded bit field. Just make a normal
boolean.
(device::exists): Redefine function.
* devices.in: Move previous functions earlier since they are now only
defined static. Rename some functions due to an as-yet unresolved bug
in gendevices. Rename posix part of internal-only devices with a
double-slash. gendevices will eventuall translate that to a ":".
(device::parse): Rework to use dev pointer and dev_storage_end.
* devices.cc: Regenerate.
* gendevices: Translate "// to ": after shilka processing.
2012-03-31 Corinna Vinschen <corinna@vinschen.de> 2012-03-31 Corinna Vinschen <corinna@vinschen.de>
* devices.cc: Regenerate. * devices.cc: Regenerate.

21624
winsup/cygwin/devices.cc
View File

File diff suppressed because it is too large Load Diff

25
winsup/cygwin/devices.h
View File

@ -8,8 +8,7 @@ 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. */
#ifndef _DEVICES_H #pragma once
#define _DEVICES_H
typedef unsigned short _major_t; typedef unsigned short _major_t;
typedef unsigned short _minor_t; typedef unsigned short _minor_t;
@ -20,6 +19,9 @@ typedef __dev32_t _dev_t;
#define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1)) #define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1))
#define _major(dev) ((dev) >> (sizeof (_major_t) * 8)) #define _major(dev) ((dev) >> (sizeof (_major_t) * 8))
#include <sys/stat.h>
#include <dirent.h>
#define MAX_CONSOLES 63 #define MAX_CONSOLES 63
enum fh_devices enum fh_devices
{ {
@ -275,9 +277,9 @@ struct device
}; };
} d; } d;
const char *native; const char *native;
bool (device::*exists_func)() const; int (*exists_func) (const device&);
bool dev_on_fs:1;
_mode_t mode; _mode_t mode;
bool dev_on_fs;
static const device *lookup (const char *, unsigned int = UINT32_MAX); static const device *lookup (const char *, unsigned int = UINT32_MAX);
void parse (const char *); void parse (const char *);
void parse (_major_t major, _minor_t minor); void parse (_major_t major, _minor_t minor);
@ -319,13 +321,13 @@ struct device
inline void setfs (bool x) {dev_on_fs = x;} inline void setfs (bool x) {dev_on_fs = x;}
inline bool isfs () const {return dev_on_fs || d.devn == FH_FS;} inline bool isfs () const {return dev_on_fs || d.devn == FH_FS;}
inline bool is_fs_special () const {return dev_on_fs && d.devn != FH_FS;} inline bool is_fs_special () const {return dev_on_fs && d.devn != FH_FS;}
inline int exists () const {return exists_func (*this);}
bool exists_never () const; unsigned char type () const
bool exists_ptys () const; {
bool exists_cons () const; if (S_ISBLK (mode))
bool exists_console () const; return DT_BLK;
bool exists_nt_dev () const; return mode >> 12;
bool exists () const; }
}; };
extern const device dev_storage[]; extern const device dev_storage[];
@ -379,4 +381,3 @@ extern const device dev_fs_storage;
|| (((int) n) == FH_CONOUT)) || (((int) n) == FH_CONOUT))
#define istty_slave_dev(n) (device::major (n) == DEV_PTYS_MAJOR) #define istty_slave_dev(n) (device::major (n) == DEV_PTYS_MAJOR)
#endif /*_DEVICES_H*/

270
winsup/cygwin/devices.in
View File

@ -10,101 +10,179 @@ typedef const device *KR_device_t;
} }
%type KR_device_t %type KR_device_t
%local { %local {
static int
exists_internal (const device&)
{
return false;
}
static int
exists (const device&)
{
return true;
}
/* Check existence of POSIX devices backed by real NT devices. */
static int
exists_ntdev (const device& dev)
{
WCHAR wpath[MAX_PATH];
UNICODE_STRING upath;
OBJECT_ATTRIBUTES attr;
HANDLE h;
NTSTATUS status;
sys_mbstowcs (wpath, MAX_PATH, dev.native);
RtlInitUnicodeString (&upath, wpath);
InitializeObjectAttributes (&attr, &upath, OBJ_CASE_INSENSITIVE, NULL, NULL);
/* Except for the serial IO devices, the native paths are
direct device paths, not symlinks, so every status code
except for "NOT_FOUND" means the device exists. */
status = NtOpenSymbolicLinkObject (&h, SYMBOLIC_LINK_QUERY, &attr);
switch (status)
{
case STATUS_OBJECT_NAME_NOT_FOUND:
case STATUS_OBJECT_PATH_NOT_FOUND:
return false;
case STATUS_SUCCESS:
NtClose (h);
default:
break;
}
return true;
}
/* Don't list via readdir but allow as a direct reference. */
static int
exists_ntdevs (const device& dev)
{
return exists_ntdev (dev) ? -1 : false;
}
static int
exists_console (const device& dev)
{
if (!iscons_dev (myself->ctty))
return false;
int devn = *const_cast<device *> (&dev);
switch (devn)
{
case FH_CONSOLE:
case FH_CONIN:
case FH_CONOUT:
return iscons_dev (myself->ctty);
default:
return myself->ctty == devn;
}
}
static int
exists_pty (const device& dev)
{
/* Only existing slave ptys. */
return cygwin_shared->tty.connect (dev.get_minor ()) != -1;
}
const device dev_cygdrive_storage = const device dev_cygdrive_storage =
{"/cygdrive", {FH_CYGDRIVE}, "/cygdrive"}; {"/cygdrive", {FH_CYGDRIVE}, "/cygdrive", exists};
const device dev_fs_storage = const device dev_fs_storage =
{"", {FH_FS}, ""}; {"", {FH_FS}, "", exists};
const device dev_proc_storage = const device dev_proc_storage =
{"", {FH_PROC}, ""}; {"", {FH_PROC}, "", exists};
const device dev_procnet_storage = const device dev_procnet_storage =
{"", {FH_PROCNET}, ""}; {"", {FH_PROCNET}, "", exists};
const device dev_procsys_storage = const device dev_procsys_storage =
{"", {FH_PROCSYS}, ""}; {"", {FH_PROCSYS}, "", exists};
const device dev_procsysvipc_storage = const device dev_procsysvipc_storage =
{"", {FH_PROCSYSVIPC}, ""}; {"", {FH_PROCSYSVIPC}, "", exists};
const device dev_netdrive_storage = const device dev_netdrive_storage =
{"", {FH_NETDRIVE}, ""}; {"", {FH_NETDRIVE}, "", exists};
const device dev_dev_storage = const device dev_dev_storage =
{"/dev", {FH_DEV}, "/dev"}; {"/dev", {FH_DEV}, "/dev", exists};
const device dev_registry_storage = const device dev_registry_storage =
{"", {FH_REGISTRY}, ""}; {"", {FH_REGISTRY}, "", exists_internal};
const device dev_piper_storage = const device dev_piper_storage =
{"", {FH_PIPER}, ""}; {"", {FH_PIPER}, "", exists_internal};
const device dev_pipew_storage = const device dev_pipew_storage =
{"", {FH_PIPEW}, ""}; {"", {FH_PIPEW}, "", exists_internal};
const device dev_tcp_storage = const device dev_tcp_storage =
{"", {FH_TCP}, ""}; {"", {FH_TCP}, "", exists_internal};
const device dev_udp_storage = const device dev_udp_storage =
{"", {FH_UDP}, ""}; {"", {FH_UDP}, "", exists_internal};
const device dev_stream_storage = const device dev_stream_storage =
{"", {FH_STREAM}, ""}; {"", {FH_STREAM}, "", exists_internal};
const device dev_dgram_storage = const device dev_dgram_storage =
{"", {FH_DGRAM}, ""}; {"", {FH_DGRAM}, "", exists_internal};
const device dev_bad_storage = const device dev_bad_storage =
{"", {FH_NADA}, ""}; {"", {FH_NADA}, "", exists_internal};
const device dev_error_storage = const device dev_error_storage =
{"", {FH_ERROR}, ""}; {"", {FH_ERROR}, "", exists_internal};
#define BRACK(x) {devn_int: x}
#define BRACK(x) {devn_int: x}
%storage_here %storage_here
} }
/* Internal devices below are marked with a //. gendevices will
eventually translate that to a : . This is done because shilka
does not support a colon here since it is designed to only handle
C keywords with special handling for "/". */
%% %%
"/dev/tty", BRACK(FH_TTY), "/dev/tty" "/dev", BRACK(FH_DEV), "/dev", exists, S_IFDIR
"/dev/pty%(0-63)d", BRACK(FHDEV(DEV_PTYS_MAJOR, {$1})), "/dev/pty{$1}", &device::exists_ptys, ptys_dev "/dev/tty", BRACK(FH_TTY), "/dev/tty", exists, S_IFCHR
"/dev/ptym%(0-63)d", BRACK(FHDEV(DEV_PTYM_MAJOR, {$1})), "/dev/ptym{$1}", &device::exists_never, ptym_dev "/dev/pty%(0-63)d", BRACK(FHDEV(DEV_PTYS_MAJOR, {$1})), "/dev/pty{$1}", exists_pty, S_IFCHR, ptys_dev
"/dev/cons%(0-63)d", BRACK(FHDEV(DEV_CONS_MAJOR, {$1})), "/dev/cons{$1}", &device::exists_cons, cons_dev "//ptym%(0-63)d", BRACK(FHDEV(DEV_PTYM_MAJOR, {$1})), "/dev/ptym{$1}", exists_internal, S_IFCHR, ptym_dev
"/dev/console", BRACK(FH_CONSOLE), "/dev/console", &device::exists_console, console_dev "/dev/cons%(0-63)d", BRACK(FHDEV(DEV_CONS_MAJOR, {$1})), "/dev/cons{$1}", exists_console, S_IFCHR, cons_dev
"/dev/ptmx", BRACK(FH_PTMX), "/dev/ptmx" "/dev/console", BRACK(FH_CONSOLE), "/dev/console", exists_console, S_IFCHR, console_dev
"/dev/windows", BRACK(FH_WINDOWS), "/dev/windows" "/dev/ptmx", BRACK(FH_PTMX), "/dev/ptmx", exists, S_IFCHR
"/dev/dsp", BRACK(FH_OSS_DSP), "/dev/dsp" "/dev/windows", BRACK(FH_WINDOWS), "/dev/windows", exists, S_IFCHR
"/dev/conin", BRACK(FH_CONIN), "/dev/conin", &device::exists_console "/dev/dsp", BRACK(FH_OSS_DSP), "/dev/dsp", exists, S_IFCHR
"/dev/conout", BRACK(FH_CONOUT), "/dev/conout", &device::exists_console "/dev/conin", BRACK(FH_CONIN), "/dev/conin", exists_console, S_IFCHR
"/dev/null", BRACK(FH_NULL), "\\Device\\Null" "/dev/conout", BRACK(FH_CONOUT), "/dev/conout", exists_console, S_IFCHR
"/dev/zero", BRACK(FH_ZERO), "/dev/zero" "/dev/null", BRACK(FH_NULL), "\\Device\\Null", exists_ntdev, S_IFCHR
"/dev/full", BRACK(FH_FULL), "/dev/full" "/dev/zero", BRACK(FH_ZERO), "/dev/zero", exists, S_IFCHR
"/dev/random", BRACK(FH_RANDOM), "/dev/random" "/dev/full", BRACK(FH_FULL), "/dev/full", exists, S_IFCHR
"/dev/urandom", BRACK(FH_URANDOM), "/dev/urandom", urandom_dev "/dev/random", BRACK(FH_RANDOM), "/dev/random", exists, S_IFCHR
"/dev/mem", BRACK(FH_MEM), "/dev/mem" "/dev/urandom", BRACK(FH_URANDOM), "/dev/urandom", exists, S_IFCHR, urandom_dev
"/dev/kmem", BRACK(FH_KMEM), "/dev/mem" "/dev/mem", BRACK(FH_MEM), "/dev/mem", exists, S_IFCHR
"/dev/clipboard", BRACK(FH_CLIPBOARD), "/dev/clipboard" "/dev/kmem", BRACK(FH_KMEM), "/dev/mem", exists, S_IFCHR
"/dev/port", BRACK(FH_PORT), "/dev/port" "/dev/clipboard", BRACK(FH_CLIPBOARD), "/dev/clipboard", exists, S_IFCHR
"/dev/com%(1-16)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1 - 1})), "\\??\\COM{$1}", &device::exists_never "/dev/port", BRACK(FH_PORT), "/dev/port", exists, S_IFCHR
"/dev/ttyS%(0-63)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1})), "\\??\\COM{$1 + 1}", &device::exists_nt_dev "/dev/com%(1-16)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1 - 1})), "\\??\\COM{$1}", exists_ntdevs, S_IFCHR
"/dev/pipe", BRACK(FH_PIPE), "/dev/pipe", &device::exists_never "/dev/ttyS%(0-63)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1})), "\\??\\COM{$1 + 1}", exists_ntdev, S_IFCHR
"/dev/fifo", BRACK(FH_FIFO), "/dev/fifo", &device::exists_never "//pipe", BRACK(FH_PIPE), "/dev/pipe", exists_internal, S_IFCHR
"/dev/st%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1})), "\\Device\\Tape{$1}", &device::exists_nt_dev "//fifo", BRACK(FH_FIFO), "/dev/fifo", exists_internal, S_IFCHR
"/dev/nst%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1 + 128})), "\\Device\\Tape{$1}", &device::exists_nt_dev "/dev/st%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1})), "\\Device\\Tape{$1}", exists_ntdev, S_IFBLK
"/dev/fd%(0-15)d", BRACK(FHDEV(DEV_FLOPPY_MAJOR, {$1})), "\\Device\\Floppy{$1}", &device::exists_nt_dev "/dev/nst%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1 + 128})), "\\Device\\Tape{$1}", exists_ntdev, S_IFBLK
"/dev/scd%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", &device::exists_nt_dev "/dev/fd%(0-15)d", BRACK(FHDEV(DEV_FLOPPY_MAJOR, {$1})), "\\Device\\Floppy{$1}", exists_ntdev, S_IFBLK
"/dev/sr%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", &device::exists_nt_dev "/dev/scd%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", exists_ntdev, S_IFBLK
"/dev/sd%{a-z}s", BRACK(FH_SD{uc $1}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0", &device::exists_nt_dev "/dev/sr%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", exists_ntdev, S_IFBLK
"/dev/sda%{a-z}s", BRACK(FH_SDA{uc $1}), "\\Device\\Harddisk{26 + ord($1) - ord('a')}\\Partition0", &device::exists_nt_dev "/dev/sd%{a-z}s", BRACK(FH_SD{uc $1}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0", exists_ntdev, S_IFBLK
"/dev/sdb%{a-z}s", BRACK(FH_SDB{uc $1}), "\\Device\\Harddisk{52 + ord($1) - ord('a')}\\Partition0", &device::exists_nt_dev "/dev/sda%{a-z}s", BRACK(FH_SDA{uc $1}), "\\Device\\Harddisk{26 + ord($1) - ord('a')}\\Partition0", exists_ntdev, S_IFBLK
"/dev/sdc%{a-z}s", BRACK(FH_SDC{uc $1}), "\\Device\\Harddisk{78 + ord($1) - ord('a')}\\Partition0", &device::exists_nt_dev "/dev/sdb%{a-z}s", BRACK(FH_SDB{uc $1}), "\\Device\\Harddisk{52 + ord($1) - ord('a')}\\Partition0", exists_ntdev, S_IFBLK
"/dev/sdd%{a-x}s", BRACK(FH_SDD{uc $1}), "\\Device\\Harddisk{104 + ord($1) - ord('a')}\\Partition0", &device::exists_nt_dev "/dev/sdc%{a-z}s", BRACK(FH_SDC{uc $1}), "\\Device\\Harddisk{78 + ord($1) - ord('a')}\\Partition0", exists_ntdev, S_IFBLK
"/dev/sd%{a-z}s%(1-15)d", BRACK(FH_SD{uc $1} | {$2}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}", &device::exists_nt_dev "/dev/sdd%{a-x}s", BRACK(FH_SDD{uc $1}), "\\Device\\Harddisk{104 + ord($1) - ord('a')}\\Partition0", exists_ntdev, S_IFBLK
"/dev/sda%{a-z}s%(1-15)d", BRACK(FH_SDA{uc $1} | {$2}), "\\Device\\Harddisk{26 + ord($1) - ord('a')}\\Partition{$2 % 16}", &device::exists_nt_dev "/dev/sd%{a-z}s%(1-15)d", BRACK(FH_SD{uc $1} | {$2}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}", exists_ntdev, S_IFBLK
"/dev/sdb%{a-z}s%(1-15)d", BRACK(FH_SDB{uc $1} | {$2}), "\\Device\\Harddisk{52 + ord($1) - ord('a')}\\Partition{$2 % 16}", &device::exists_nt_dev "/dev/sda%{a-z}s%(1-15)d", BRACK(FH_SDA{uc $1} | {$2}), "\\Device\\Harddisk{26 + ord($1) - ord('a')}\\Partition{$2 % 16}", exists_ntdev, S_IFBLK
"/dev/sdc%{a-z}s%(1-15)d", BRACK(FH_SDC{uc $1} | {$2}), "\\Device\\Harddisk{78 + ord($1) - ord('a')}\\Partition{$2 % 16}", &device::exists_nt_dev "/dev/sdb%{a-z}s%(1-15)d", BRACK(FH_SDB{uc $1} | {$2}), "\\Device\\Harddisk{52 + ord($1) - ord('a')}\\Partition{$2 % 16}", exists_ntdev, S_IFBLK
"/dev/sdd%{a-x}s%(1-15)d", BRACK(FH_SDD{uc $1} | {$2}), "\\Device\\Harddisk{104 + ord($1) - ord('a')}\\Partition{$2 % 16}", &device::exists_nt_dev "/dev/sdc%{a-z}s%(1-15)d", BRACK(FH_SDC{uc $1} | {$2}), "\\Device\\Harddisk{78 + ord($1) - ord('a')}\\Partition{$2 % 16}", exists_ntdev, S_IFBLK
"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg" "/dev/sdd%{a-x}s%(1-15)d", BRACK(FH_SDD{uc $1} | {$2}), "\\Device\\Harddisk{104 + ord($1) - ord('a')}\\Partition{$2 % 16}", exists_ntdev, S_IFBLK
"/dev", BRACK(FH_DEV), "/dev" "/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg", exists_ntdev, S_IFCHR
%other {return NULL;} %other {return NULL;}
%% %%
#undef BRACK #undef BRACK
@ -132,14 +210,14 @@ device::init ()
void void
device::parse (_major_t major, _minor_t minor) device::parse (_major_t major, _minor_t minor)
{ {
_dev_t dev = FHDEV (major, minor); _dev_t devn = FHDEV (major, minor);
d.devn = 0; d.devn = 0;
for (unsigned i = 0; i < (sizeof (dev_storage) / sizeof (dev_storage[0])); i++) for (const device *devidx = dev_storage; devidx < dev_storage_end; devidx++)
if (dev_storage[i].d.devn == dev) if (devidx->d.devn == devn)
{ {
*this = dev_storage[i]; *this = *devidx;
break; break;
} }
@ -198,71 +276,3 @@ device::parsedisk (int drive, int part)
} }
parse (base, part + (drive * 16)); parse (base, part + (drive * 16));
} }
bool
device::exists_never () const
{
return false;
}
bool
device::exists_ptys () const
{
/* Only in-use ptys exist. */
return cygwin_shared->tty.connect (get_minor ()) != -1;
}
bool
device::exists_cons () const
{
/* /dev/consX only exists, if it's the current controlling tty. */
return iscons_dev (myself->ctty) && myself->ctty == d.devn_int;
}
bool
device::exists_console () const
{
/* console, conin, conout only exist if a console is our controlling tty. */
return iscons_dev (myself->ctty);
}
bool
device::exists_nt_dev () const
{
/* POSIX devices backed by real NT devices only exist if their NT device
exists. */
WCHAR wpath[MAX_PATH];
UNICODE_STRING upath;
OBJECT_ATTRIBUTES attr;
HANDLE h;
NTSTATUS status;
sys_mbstowcs (wpath, MAX_PATH, native);
RtlInitUnicodeString (&upath, wpath);
InitializeObjectAttributes (&attr, &upath,
OBJ_CASE_INSENSITIVE, NULL, NULL);
/* Except for the serial IO devices, the native paths are direct device
paths, not symlinks, so every status code except for "NOT_FOUND" means
the device exists. */
status = NtOpenSymbolicLinkObject (&h, SYMBOLIC_LINK_QUERY, &attr);
switch (status)
{
case STATUS_OBJECT_NAME_NOT_FOUND:
case STATUS_OBJECT_PATH_NOT_FOUND:
return false;
case STATUS_SUCCESS:
NtClose (h);
break;
default:
break;
}
return true;
}
bool
device::exists () const
{
if (!exists_func)
return true;
return (this->*exists_func)();
}

5
winsup/cygwin/fhandler_dev.cc
View File

@ -119,7 +119,10 @@ fhandler_dev::readdir (DIR *dir, dirent *de)
while (devidx < dev_storage_end) while (devidx < dev_storage_end)
{ {
const device& thisdev = *devidx++; const device& thisdev = *devidx++;
if (!thisdev.exists ()) /* If exists returns < 0 it means that the device can be used by a
program but its use is deprecated and, so, it is not returned
by readdir((). */
if (thisdev.exists () <= 0)
continue; continue;
++dir->__d_position; ++dir->__d_position;
strcpy (de->d_name, thisdev.name + dev_prefix_len); strcpy (de->d_name, thisdev.name + dev_prefix_len);

5
winsup/cygwin/gendevices
View File

@ -70,7 +70,7 @@ if ($? == -1) {
} }
chdir $cwd; chdir $cwd;
unlink $shilka; unlink $shilka;
open(C, $c) or die "$0: couldn't open $c - $!\n"; open(C, '<', $c) or die "$0: couldn't open $c - $!\n";
@lines = <C>; @lines = <C>;
close C; close C;
unlink $c; unlink $c;
@ -84,6 +84,7 @@ for (my $i = 0; $i < @lines; $i++) {
splice(@lines, $i, 1); splice(@lines, $i, 1);
redo; redo;
}; };
$lines[$i] =~ s%"//%":%go;
} }
open(OUTPUT, '>', $output) or do {{ open(OUTPUT, '>', $output) or do {{
if (chmod(0664, $output)) { if (chmod(0664, $output)) {
@ -155,5 +156,7 @@ sub devsort {
my $b0 = $b->[0]; my $b0 = $b->[0];
$a0 =~ s/(\D)(\d+)/"$1" . sprintf "%05d", $2/e; $a0 =~ s/(\D)(\d+)/"$1" . sprintf "%05d", $2/e;
$b0 =~ s/(\D)(\d+)/"$1" . sprintf "%05d", $2/e; $b0 =~ s/(\D)(\d+)/"$1" . sprintf "%05d", $2/e;
$a0 =~ s%^//%:%o;
$b0 =~ s%^//%:%o;
return $a0 cmp $b0; return $a0 cmp $b0;
} }