From 14c4d65ef1240b1c18db06c3030b4e0830b0c701 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 24 Aug 2005 04:38:39 +0000 Subject: [PATCH] * cygheap.h (cygheap_types): Add HEAP_COMMUNE. * fhandler_proc.cc: Use cygheap rather than user heap for allocation of filebuf throughout. * fhandler_registry.cc: Ditto. * fhandler_virtual.cc: Ditto. * fhandler_process.cc: Ditto. (get_mem_values): Use malloc/realloc/free rather than new. * pinfo.cc (_pinfo::commune_send): Allocate on cygwin heap rather than user heap. Avoid calling ReadFile when correct number of characters have been read or suffer buffer corruption. (_pinfo::fd): Allocate on cygwin heap rather than user heap. (_pinfo::fds): Ditto. (_pinfo::root): Ditto. (_pinfo::cwd): Ditto. (_pinfo::cmdline): Ditto. * devices.h (FH_DEV): New define. * devices.in: Detect lone /dev. * devices.cc: Regenerate. * path.cc (path_conv::check): Treat FH_DEV as a special case. --- winsup/cygwin/ChangeLog | 23 + winsup/cygwin/cygheap.h | 1 + winsup/cygwin/devices.cc | 1701 ++++++++++++++-------------- winsup/cygwin/devices.h | 1 + winsup/cygwin/devices.in | 6 + winsup/cygwin/fhandler_proc.cc | 16 +- winsup/cygwin/fhandler_process.cc | 50 +- winsup/cygwin/fhandler_registry.cc | 9 +- winsup/cygwin/fhandler_virtual.cc | 12 +- winsup/cygwin/path.cc | 8 +- winsup/cygwin/pinfo.cc | 18 +- 11 files changed, 954 insertions(+), 891 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7719330ff..30012a061 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,26 @@ +2005-08-24 Christopher Faylor + + * cygheap.h (cygheap_types): Add HEAP_COMMUNE. + * fhandler_proc.cc: Use cygheap rather than user heap for allocation of + filebuf throughout. + * fhandler_registry.cc: Ditto. + * fhandler_virtual.cc: Ditto. + * fhandler_process.cc: Ditto. + (get_mem_values): Use malloc/realloc/free rather than new. + * pinfo.cc (_pinfo::commune_send): Allocate on cygwin heap rather than + user heap. Avoid calling ReadFile when correct number of characters + have been read or suffer buffer corruption. + (_pinfo::fd): Allocate on cygwin heap rather than user heap. + (_pinfo::fds): Ditto. + (_pinfo::root): Ditto. + (_pinfo::cwd): Ditto. + (_pinfo::cmdline): Ditto. + + * devices.h (FH_DEV): New define. + * devices.in: Detect lone /dev. + * devices.cc: Regenerate. + * path.cc (path_conv::check): Treat FH_DEV as a special case. + 2005-08-23 Christopher Faylor * sigproc.h (set_signal_mask): Remove default on second parameter and diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index 3b319d094..e5ce58f4d 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -20,6 +20,7 @@ enum cygheap_types HEAP_SIGS, HEAP_ARCHETYPES, HEAP_TLS, + HEAP_COMMUNE, HEAP_1_START, HEAP_1_HOOK, HEAP_1_STR, diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc index 35b2f9e7d..b35b3356c 100644 --- a/winsup/cygwin/devices.cc +++ b/winsup/cygwin/devices.cc @@ -28,6 +28,11 @@ const device dev_proc_storage = const device dev_netdrive_storage = {"", {FH_NETDRIVE}, ""}; +#if 0 +const device dev_dev_storage = + {"/dev", {FH_DEV}, "/dev"}; +#endif + const device dev_registry_storage = {"", {FH_REGISTRY}, ""}; @@ -55,6 +60,7 @@ const device dev_bad_storage = static const device dev_storage[] = { + {"/dev", BRACK(FH_DEV), "/dev"}, {"/dev/clipboard", BRACK(FH_CLIPBOARD), "\\dev\\clipboard"}, {"/dev/com1", BRACK(FHDEV(DEV_SERIAL_MAJOR, 1)), "\\\\.\\com1"}, {"/dev/com2", BRACK(FHDEV(DEV_SERIAL_MAJOR, 2)), "\\\\.\\com2"}, @@ -893,10 +899,10 @@ static const device dev_storage[] = {"/dev/zero", BRACK(FH_ZERO), "\\dev\\zero"} }; -const device *console_dev = dev_storage + 19; -const device *ttym_dev = dev_storage + 832; -const device *ttys_dev = dev_storage + 752; -const device *urandom_dev = dev_storage + 833; +const device *console_dev = dev_storage + 20; +const device *ttym_dev = dev_storage + 833; +const device *ttys_dev = dev_storage + 753; +const device *urandom_dev = dev_storage + 834; static KR_device_t KR_find_keyword (const char *KR_keyword, int KR_length) @@ -904,6 +910,21 @@ static KR_device_t KR_find_keyword (const char *KR_keyword, int KR_length) switch (KR_length) { + case 4: + if (strncmp (KR_keyword, "/dev", 4) == 0) + { +{ +return dev_storage + 0; + +} + } + else + { +{ +return NULL; + +} + } case 8: switch (KR_keyword [7]) { @@ -911,7 +932,7 @@ static KR_device_t KR_find_keyword (const char *KR_keyword, int KR_length) if (strncmp (KR_keyword, "/dev/sdz", 8) == 0) { { -return dev_storage + 216; +return dev_storage + 217; } } @@ -929,7 +950,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty", 8) == 0) { { -return dev_storage + 751; +return dev_storage + 752; } } @@ -944,7 +965,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy", 8) == 0) { { -return dev_storage + 215; +return dev_storage + 216; } } @@ -965,7 +986,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx", 8) == 0) { { -return dev_storage + 214; +return dev_storage + 215; } } @@ -980,7 +1001,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw", 8) == 0) { { -return dev_storage + 213; +return dev_storage + 214; } } @@ -995,7 +1016,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv", 8) == 0) { { -return dev_storage + 212; +return dev_storage + 213; } } @@ -1010,7 +1031,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu", 8) == 0) { { -return dev_storage + 211; +return dev_storage + 212; } } @@ -1025,7 +1046,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt", 8) == 0) { { -return dev_storage + 210; +return dev_storage + 211; } } @@ -1040,7 +1061,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds", 8) == 0) { { -return dev_storage + 209; +return dev_storage + 210; } } @@ -1055,7 +1076,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr", 8) == 0) { { -return dev_storage + 208; +return dev_storage + 209; } } @@ -1070,7 +1091,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq", 8) == 0) { { -return dev_storage + 207; +return dev_storage + 208; } } @@ -1088,7 +1109,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp", 8) == 0) { { -return dev_storage + 206; +return dev_storage + 207; } } @@ -1103,7 +1124,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/dsp", 8) == 0) { { -return dev_storage + 20; +return dev_storage + 21; } } @@ -1124,7 +1145,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo", 8) == 0) { { -return dev_storage + 205; +return dev_storage + 206; } } @@ -1139,7 +1160,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn", 8) == 0) { { -return dev_storage + 204; +return dev_storage + 205; } } @@ -1157,7 +1178,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm", 8) == 0) { { -return dev_storage + 203; +return dev_storage + 204; } } @@ -1172,7 +1193,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/mem", 8) == 0) { { -return dev_storage + 41; +return dev_storage + 42; } } @@ -1193,7 +1214,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl", 8) == 0) { { -return dev_storage + 202; +return dev_storage + 203; } } @@ -1208,7 +1229,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk", 8) == 0) { { -return dev_storage + 201; +return dev_storage + 202; } } @@ -1223,7 +1244,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj", 8) == 0) { { -return dev_storage + 200; +return dev_storage + 201; } } @@ -1238,7 +1259,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi", 8) == 0) { { -return dev_storage + 199; +return dev_storage + 200; } } @@ -1253,7 +1274,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh", 8) == 0) { { -return dev_storage + 198; +return dev_storage + 199; } } @@ -1268,7 +1289,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg", 8) == 0) { { -return dev_storage + 197; +return dev_storage + 198; } } @@ -1283,7 +1304,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf", 8) == 0) { { -return dev_storage + 196; +return dev_storage + 197; } } @@ -1298,7 +1319,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde", 8) == 0) { { -return dev_storage + 195; +return dev_storage + 196; } } @@ -1313,7 +1334,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd", 8) == 0) { { -return dev_storage + 194; +return dev_storage + 195; } } @@ -1328,7 +1349,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc", 8) == 0) { { -return dev_storage + 193; +return dev_storage + 194; } } @@ -1343,7 +1364,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb", 8) == 0) { { -return dev_storage + 192; +return dev_storage + 193; } } @@ -1358,7 +1379,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda", 8) == 0) { { -return dev_storage + 191; +return dev_storage + 192; } } @@ -1376,7 +1397,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st9", 8) == 0) { { -return dev_storage + 632; +return dev_storage + 633; } } @@ -1391,7 +1412,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr9", 8) == 0) { { -return dev_storage + 616; +return dev_storage + 617; } } @@ -1406,7 +1427,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd9", 8) == 0) { { -return dev_storage + 30; +return dev_storage + 31; } } @@ -1430,7 +1451,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st8", 8) == 0) { { -return dev_storage + 631; +return dev_storage + 632; } } @@ -1445,7 +1466,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr8", 8) == 0) { { -return dev_storage + 615; +return dev_storage + 616; } } @@ -1460,7 +1481,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd8", 8) == 0) { { -return dev_storage + 29; +return dev_storage + 30; } } @@ -1484,7 +1505,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st7", 8) == 0) { { -return dev_storage + 630; +return dev_storage + 631; } } @@ -1499,7 +1520,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr7", 8) == 0) { { -return dev_storage + 614; +return dev_storage + 615; } } @@ -1514,7 +1535,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd7", 8) == 0) { { -return dev_storage + 28; +return dev_storage + 29; } } @@ -1538,7 +1559,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st6", 8) == 0) { { -return dev_storage + 629; +return dev_storage + 630; } } @@ -1553,7 +1574,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr6", 8) == 0) { { -return dev_storage + 613; +return dev_storage + 614; } } @@ -1568,7 +1589,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd6", 8) == 0) { { -return dev_storage + 27; +return dev_storage + 28; } } @@ -1592,7 +1613,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st5", 8) == 0) { { -return dev_storage + 628; +return dev_storage + 629; } } @@ -1607,7 +1628,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr5", 8) == 0) { { -return dev_storage + 612; +return dev_storage + 613; } } @@ -1622,7 +1643,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd5", 8) == 0) { { -return dev_storage + 26; +return dev_storage + 27; } } @@ -1646,7 +1667,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st4", 8) == 0) { { -return dev_storage + 627; +return dev_storage + 628; } } @@ -1661,7 +1682,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr4", 8) == 0) { { -return dev_storage + 611; +return dev_storage + 612; } } @@ -1676,7 +1697,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd4", 8) == 0) { { -return dev_storage + 25; +return dev_storage + 26; } } @@ -1700,7 +1721,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st3", 8) == 0) { { -return dev_storage + 626; +return dev_storage + 627; } } @@ -1715,7 +1736,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr3", 8) == 0) { { -return dev_storage + 610; +return dev_storage + 611; } } @@ -1730,7 +1751,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd3", 8) == 0) { { -return dev_storage + 24; +return dev_storage + 25; } } @@ -1754,7 +1775,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st2", 8) == 0) { { -return dev_storage + 625; +return dev_storage + 626; } } @@ -1769,7 +1790,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr2", 8) == 0) { { -return dev_storage + 609; +return dev_storage + 610; } } @@ -1784,7 +1805,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd2", 8) == 0) { { -return dev_storage + 23; +return dev_storage + 24; } } @@ -1808,7 +1829,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st1", 8) == 0) { { -return dev_storage + 624; +return dev_storage + 625; } } @@ -1823,7 +1844,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr1", 8) == 0) { { -return dev_storage + 608; +return dev_storage + 609; } } @@ -1838,7 +1859,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd1", 8) == 0) { { -return dev_storage + 22; +return dev_storage + 23; } } @@ -1862,7 +1883,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st0", 8) == 0) { { -return dev_storage + 623; +return dev_storage + 624; } } @@ -1877,7 +1898,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr0", 8) == 0) { { -return dev_storage + 607; +return dev_storage + 608; } } @@ -1892,7 +1913,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd0", 8) == 0) { { -return dev_storage + 21; +return dev_storage + 22; } } @@ -1922,7 +1943,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ptmx", 9) == 0) { { -return dev_storage + 173; +return dev_storage + 174; } } @@ -1937,7 +1958,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/port", 9) == 0) { { -return dev_storage + 172; +return dev_storage + 173; } } @@ -1955,7 +1976,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/zero", 9) == 0) { { -return dev_storage + 835; +return dev_storage + 836; } } @@ -1970,7 +1991,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fifo", 9) == 0) { { -return dev_storage + 37; +return dev_storage + 38; } } @@ -1994,7 +2015,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttym", 9) == 0) { { -return dev_storage + 832; +return dev_storage + 833; } } @@ -2009,7 +2030,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/kmem", 9) == 0) { { -return dev_storage + 39; +return dev_storage + 40; } } @@ -2033,7 +2054,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/null", 9) == 0) { { -return dev_storage + 170; +return dev_storage + 171; } } @@ -2048,7 +2069,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/full", 9) == 0) { { -return dev_storage + 38; +return dev_storage + 39; } } @@ -2069,7 +2090,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/kmsg", 9) == 0) { { -return dev_storage + 40; +return dev_storage + 41; } } @@ -2084,7 +2105,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/pipe", 9) == 0) { { -return dev_storage + 171; +return dev_storage + 172; } } @@ -2102,7 +2123,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz9", 9) == 0) { { -return dev_storage + 600; +return dev_storage + 601; } } @@ -2120,7 +2141,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty9", 9) == 0) { { -return dev_storage + 761; +return dev_storage + 762; } } @@ -2135,7 +2156,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy9", 9) == 0) { { -return dev_storage + 585; +return dev_storage + 586; } } @@ -2156,7 +2177,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx9", 9) == 0) { { -return dev_storage + 570; +return dev_storage + 571; } } @@ -2171,7 +2192,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw9", 9) == 0) { { -return dev_storage + 555; +return dev_storage + 556; } } @@ -2186,7 +2207,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv9", 9) == 0) { { -return dev_storage + 540; +return dev_storage + 541; } } @@ -2201,7 +2222,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu9", 9) == 0) { { -return dev_storage + 525; +return dev_storage + 526; } } @@ -2219,7 +2240,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt9", 9) == 0) { { -return dev_storage + 510; +return dev_storage + 511; } } @@ -2234,7 +2255,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst9", 9) == 0) { { -return dev_storage + 51; +return dev_storage + 52; } } @@ -2255,7 +2276,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds9", 9) == 0) { { -return dev_storage + 495; +return dev_storage + 496; } } @@ -2270,7 +2291,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr9", 9) == 0) { { -return dev_storage + 480; +return dev_storage + 481; } } @@ -2285,7 +2306,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq9", 9) == 0) { { -return dev_storage + 465; +return dev_storage + 466; } } @@ -2300,7 +2321,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp9", 9) == 0) { { -return dev_storage + 450; +return dev_storage + 451; } } @@ -2315,7 +2336,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo9", 9) == 0) { { -return dev_storage + 435; +return dev_storage + 436; } } @@ -2330,7 +2351,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn9", 9) == 0) { { -return dev_storage + 420; +return dev_storage + 421; } } @@ -2348,7 +2369,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm9", 9) == 0) { { -return dev_storage + 405; +return dev_storage + 406; } } @@ -2363,7 +2384,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com9", 9) == 0) { { -return dev_storage + 9; +return dev_storage + 10; } } @@ -2384,7 +2405,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl9", 9) == 0) { { -return dev_storage + 390; +return dev_storage + 391; } } @@ -2399,7 +2420,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk9", 9) == 0) { { -return dev_storage + 375; +return dev_storage + 376; } } @@ -2414,7 +2435,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj9", 9) == 0) { { -return dev_storage + 360; +return dev_storage + 361; } } @@ -2429,7 +2450,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi9", 9) == 0) { { -return dev_storage + 345; +return dev_storage + 346; } } @@ -2444,7 +2465,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh9", 9) == 0) { { -return dev_storage + 330; +return dev_storage + 331; } } @@ -2459,7 +2480,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg9", 9) == 0) { { -return dev_storage + 315; +return dev_storage + 316; } } @@ -2474,7 +2495,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf9", 9) == 0) { { -return dev_storage + 300; +return dev_storage + 301; } } @@ -2489,7 +2510,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde9", 9) == 0) { { -return dev_storage + 285; +return dev_storage + 286; } } @@ -2507,7 +2528,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd9", 9) == 0) { { -return dev_storage + 270; +return dev_storage + 271; } } @@ -2522,7 +2543,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd9", 9) == 0) { { -return dev_storage + 184; +return dev_storage + 185; } } @@ -2543,7 +2564,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc9", 9) == 0) { { -return dev_storage + 255; +return dev_storage + 256; } } @@ -2558,7 +2579,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb9", 9) == 0) { { -return dev_storage + 240; +return dev_storage + 241; } } @@ -2573,7 +2594,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda9", 9) == 0) { { -return dev_storage + 225; +return dev_storage + 226; } } @@ -2588,7 +2609,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st99", 9) == 0) { { -return dev_storage + 722; +return dev_storage + 723; } } @@ -2603,7 +2624,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st89", 9) == 0) { { -return dev_storage + 712; +return dev_storage + 713; } } @@ -2618,7 +2639,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st79", 9) == 0) { { -return dev_storage + 702; +return dev_storage + 703; } } @@ -2633,7 +2654,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st69", 9) == 0) { { -return dev_storage + 692; +return dev_storage + 693; } } @@ -2648,7 +2669,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st59", 9) == 0) { { -return dev_storage + 682; +return dev_storage + 683; } } @@ -2663,7 +2684,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st49", 9) == 0) { { -return dev_storage + 672; +return dev_storage + 673; } } @@ -2678,7 +2699,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st39", 9) == 0) { { -return dev_storage + 662; +return dev_storage + 663; } } @@ -2693,7 +2714,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st29", 9) == 0) { { -return dev_storage + 652; +return dev_storage + 653; } } @@ -2708,7 +2729,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st19", 9) == 0) { { -return dev_storage + 642; +return dev_storage + 643; } } @@ -2732,7 +2753,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz8", 9) == 0) { { -return dev_storage + 599; +return dev_storage + 600; } } @@ -2750,7 +2771,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty8", 9) == 0) { { -return dev_storage + 760; +return dev_storage + 761; } } @@ -2765,7 +2786,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy8", 9) == 0) { { -return dev_storage + 584; +return dev_storage + 585; } } @@ -2786,7 +2807,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx8", 9) == 0) { { -return dev_storage + 569; +return dev_storage + 570; } } @@ -2801,7 +2822,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw8", 9) == 0) { { -return dev_storage + 554; +return dev_storage + 555; } } @@ -2816,7 +2837,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv8", 9) == 0) { { -return dev_storage + 539; +return dev_storage + 540; } } @@ -2831,7 +2852,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu8", 9) == 0) { { -return dev_storage + 524; +return dev_storage + 525; } } @@ -2849,7 +2870,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt8", 9) == 0) { { -return dev_storage + 509; +return dev_storage + 510; } } @@ -2864,7 +2885,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst8", 9) == 0) { { -return dev_storage + 50; +return dev_storage + 51; } } @@ -2885,7 +2906,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds8", 9) == 0) { { -return dev_storage + 494; +return dev_storage + 495; } } @@ -2900,7 +2921,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr8", 9) == 0) { { -return dev_storage + 479; +return dev_storage + 480; } } @@ -2915,7 +2936,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq8", 9) == 0) { { -return dev_storage + 464; +return dev_storage + 465; } } @@ -2930,7 +2951,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp8", 9) == 0) { { -return dev_storage + 449; +return dev_storage + 450; } } @@ -2945,7 +2966,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo8", 9) == 0) { { -return dev_storage + 434; +return dev_storage + 435; } } @@ -2960,7 +2981,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn8", 9) == 0) { { -return dev_storage + 419; +return dev_storage + 420; } } @@ -2978,7 +2999,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm8", 9) == 0) { { -return dev_storage + 404; +return dev_storage + 405; } } @@ -2993,7 +3014,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com8", 9) == 0) { { -return dev_storage + 8; +return dev_storage + 9; } } @@ -3014,7 +3035,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl8", 9) == 0) { { -return dev_storage + 389; +return dev_storage + 390; } } @@ -3029,7 +3050,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk8", 9) == 0) { { -return dev_storage + 374; +return dev_storage + 375; } } @@ -3044,7 +3065,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj8", 9) == 0) { { -return dev_storage + 359; +return dev_storage + 360; } } @@ -3059,7 +3080,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi8", 9) == 0) { { -return dev_storage + 344; +return dev_storage + 345; } } @@ -3074,7 +3095,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh8", 9) == 0) { { -return dev_storage + 329; +return dev_storage + 330; } } @@ -3089,7 +3110,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg8", 9) == 0) { { -return dev_storage + 314; +return dev_storage + 315; } } @@ -3104,7 +3125,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf8", 9) == 0) { { -return dev_storage + 299; +return dev_storage + 300; } } @@ -3119,7 +3140,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde8", 9) == 0) { { -return dev_storage + 284; +return dev_storage + 285; } } @@ -3137,7 +3158,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd8", 9) == 0) { { -return dev_storage + 269; +return dev_storage + 270; } } @@ -3152,7 +3173,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd8", 9) == 0) { { -return dev_storage + 183; +return dev_storage + 184; } } @@ -3173,7 +3194,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc8", 9) == 0) { { -return dev_storage + 254; +return dev_storage + 255; } } @@ -3188,7 +3209,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb8", 9) == 0) { { -return dev_storage + 239; +return dev_storage + 240; } } @@ -3203,7 +3224,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda8", 9) == 0) { { -return dev_storage + 224; +return dev_storage + 225; } } @@ -3218,7 +3239,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st98", 9) == 0) { { -return dev_storage + 721; +return dev_storage + 722; } } @@ -3233,7 +3254,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st88", 9) == 0) { { -return dev_storage + 711; +return dev_storage + 712; } } @@ -3248,7 +3269,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st78", 9) == 0) { { -return dev_storage + 701; +return dev_storage + 702; } } @@ -3263,7 +3284,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st68", 9) == 0) { { -return dev_storage + 691; +return dev_storage + 692; } } @@ -3278,7 +3299,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st58", 9) == 0) { { -return dev_storage + 681; +return dev_storage + 682; } } @@ -3293,7 +3314,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st48", 9) == 0) { { -return dev_storage + 671; +return dev_storage + 672; } } @@ -3308,7 +3329,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st38", 9) == 0) { { -return dev_storage + 661; +return dev_storage + 662; } } @@ -3323,7 +3344,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st28", 9) == 0) { { -return dev_storage + 651; +return dev_storage + 652; } } @@ -3338,7 +3359,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st18", 9) == 0) { { -return dev_storage + 641; +return dev_storage + 642; } } @@ -3362,7 +3383,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz7", 9) == 0) { { -return dev_storage + 598; +return dev_storage + 599; } } @@ -3380,7 +3401,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty7", 9) == 0) { { -return dev_storage + 759; +return dev_storage + 760; } } @@ -3395,7 +3416,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy7", 9) == 0) { { -return dev_storage + 583; +return dev_storage + 584; } } @@ -3416,7 +3437,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx7", 9) == 0) { { -return dev_storage + 568; +return dev_storage + 569; } } @@ -3431,7 +3452,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw7", 9) == 0) { { -return dev_storage + 553; +return dev_storage + 554; } } @@ -3446,7 +3467,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv7", 9) == 0) { { -return dev_storage + 538; +return dev_storage + 539; } } @@ -3461,7 +3482,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu7", 9) == 0) { { -return dev_storage + 523; +return dev_storage + 524; } } @@ -3479,7 +3500,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt7", 9) == 0) { { -return dev_storage + 508; +return dev_storage + 509; } } @@ -3494,7 +3515,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst7", 9) == 0) { { -return dev_storage + 49; +return dev_storage + 50; } } @@ -3515,7 +3536,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds7", 9) == 0) { { -return dev_storage + 493; +return dev_storage + 494; } } @@ -3530,7 +3551,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr7", 9) == 0) { { -return dev_storage + 478; +return dev_storage + 479; } } @@ -3545,7 +3566,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq7", 9) == 0) { { -return dev_storage + 463; +return dev_storage + 464; } } @@ -3560,7 +3581,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp7", 9) == 0) { { -return dev_storage + 448; +return dev_storage + 449; } } @@ -3575,7 +3596,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo7", 9) == 0) { { -return dev_storage + 433; +return dev_storage + 434; } } @@ -3590,7 +3611,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn7", 9) == 0) { { -return dev_storage + 418; +return dev_storage + 419; } } @@ -3608,7 +3629,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm7", 9) == 0) { { -return dev_storage + 403; +return dev_storage + 404; } } @@ -3623,7 +3644,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com7", 9) == 0) { { -return dev_storage + 7; +return dev_storage + 8; } } @@ -3644,7 +3665,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl7", 9) == 0) { { -return dev_storage + 388; +return dev_storage + 389; } } @@ -3659,7 +3680,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk7", 9) == 0) { { -return dev_storage + 373; +return dev_storage + 374; } } @@ -3674,7 +3695,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj7", 9) == 0) { { -return dev_storage + 358; +return dev_storage + 359; } } @@ -3689,7 +3710,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi7", 9) == 0) { { -return dev_storage + 343; +return dev_storage + 344; } } @@ -3704,7 +3725,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh7", 9) == 0) { { -return dev_storage + 328; +return dev_storage + 329; } } @@ -3719,7 +3740,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg7", 9) == 0) { { -return dev_storage + 313; +return dev_storage + 314; } } @@ -3734,7 +3755,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf7", 9) == 0) { { -return dev_storage + 298; +return dev_storage + 299; } } @@ -3749,7 +3770,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde7", 9) == 0) { { -return dev_storage + 283; +return dev_storage + 284; } } @@ -3767,7 +3788,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd7", 9) == 0) { { -return dev_storage + 268; +return dev_storage + 269; } } @@ -3782,7 +3803,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd7", 9) == 0) { { -return dev_storage + 182; +return dev_storage + 183; } } @@ -3803,7 +3824,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc7", 9) == 0) { { -return dev_storage + 253; +return dev_storage + 254; } } @@ -3818,7 +3839,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb7", 9) == 0) { { -return dev_storage + 238; +return dev_storage + 239; } } @@ -3833,7 +3854,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda7", 9) == 0) { { -return dev_storage + 223; +return dev_storage + 224; } } @@ -3848,7 +3869,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st97", 9) == 0) { { -return dev_storage + 720; +return dev_storage + 721; } } @@ -3863,7 +3884,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st87", 9) == 0) { { -return dev_storage + 710; +return dev_storage + 711; } } @@ -3878,7 +3899,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st77", 9) == 0) { { -return dev_storage + 700; +return dev_storage + 701; } } @@ -3893,7 +3914,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st67", 9) == 0) { { -return dev_storage + 690; +return dev_storage + 691; } } @@ -3908,7 +3929,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st57", 9) == 0) { { -return dev_storage + 680; +return dev_storage + 681; } } @@ -3923,7 +3944,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st47", 9) == 0) { { -return dev_storage + 670; +return dev_storage + 671; } } @@ -3938,7 +3959,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st37", 9) == 0) { { -return dev_storage + 660; +return dev_storage + 661; } } @@ -3953,7 +3974,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st27", 9) == 0) { { -return dev_storage + 650; +return dev_storage + 651; } } @@ -3968,7 +3989,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st17", 9) == 0) { { -return dev_storage + 640; +return dev_storage + 641; } } @@ -3992,7 +4013,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz6", 9) == 0) { { -return dev_storage + 597; +return dev_storage + 598; } } @@ -4010,7 +4031,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty6", 9) == 0) { { -return dev_storage + 758; +return dev_storage + 759; } } @@ -4025,7 +4046,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy6", 9) == 0) { { -return dev_storage + 582; +return dev_storage + 583; } } @@ -4046,7 +4067,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx6", 9) == 0) { { -return dev_storage + 567; +return dev_storage + 568; } } @@ -4061,7 +4082,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw6", 9) == 0) { { -return dev_storage + 552; +return dev_storage + 553; } } @@ -4076,7 +4097,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv6", 9) == 0) { { -return dev_storage + 537; +return dev_storage + 538; } } @@ -4091,7 +4112,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu6", 9) == 0) { { -return dev_storage + 522; +return dev_storage + 523; } } @@ -4109,7 +4130,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt6", 9) == 0) { { -return dev_storage + 507; +return dev_storage + 508; } } @@ -4124,7 +4145,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst6", 9) == 0) { { -return dev_storage + 48; +return dev_storage + 49; } } @@ -4145,7 +4166,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds6", 9) == 0) { { -return dev_storage + 492; +return dev_storage + 493; } } @@ -4160,7 +4181,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr6", 9) == 0) { { -return dev_storage + 477; +return dev_storage + 478; } } @@ -4175,7 +4196,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq6", 9) == 0) { { -return dev_storage + 462; +return dev_storage + 463; } } @@ -4190,7 +4211,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp6", 9) == 0) { { -return dev_storage + 447; +return dev_storage + 448; } } @@ -4205,7 +4226,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo6", 9) == 0) { { -return dev_storage + 432; +return dev_storage + 433; } } @@ -4220,7 +4241,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn6", 9) == 0) { { -return dev_storage + 417; +return dev_storage + 418; } } @@ -4238,7 +4259,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm6", 9) == 0) { { -return dev_storage + 402; +return dev_storage + 403; } } @@ -4253,7 +4274,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com6", 9) == 0) { { -return dev_storage + 6; +return dev_storage + 7; } } @@ -4274,7 +4295,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl6", 9) == 0) { { -return dev_storage + 387; +return dev_storage + 388; } } @@ -4289,7 +4310,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk6", 9) == 0) { { -return dev_storage + 372; +return dev_storage + 373; } } @@ -4304,7 +4325,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj6", 9) == 0) { { -return dev_storage + 357; +return dev_storage + 358; } } @@ -4319,7 +4340,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi6", 9) == 0) { { -return dev_storage + 342; +return dev_storage + 343; } } @@ -4334,7 +4355,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh6", 9) == 0) { { -return dev_storage + 327; +return dev_storage + 328; } } @@ -4349,7 +4370,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg6", 9) == 0) { { -return dev_storage + 312; +return dev_storage + 313; } } @@ -4364,7 +4385,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf6", 9) == 0) { { -return dev_storage + 297; +return dev_storage + 298; } } @@ -4379,7 +4400,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde6", 9) == 0) { { -return dev_storage + 282; +return dev_storage + 283; } } @@ -4397,7 +4418,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd6", 9) == 0) { { -return dev_storage + 267; +return dev_storage + 268; } } @@ -4412,7 +4433,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd6", 9) == 0) { { -return dev_storage + 181; +return dev_storage + 182; } } @@ -4433,7 +4454,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc6", 9) == 0) { { -return dev_storage + 252; +return dev_storage + 253; } } @@ -4448,7 +4469,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb6", 9) == 0) { { -return dev_storage + 237; +return dev_storage + 238; } } @@ -4463,7 +4484,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda6", 9) == 0) { { -return dev_storage + 222; +return dev_storage + 223; } } @@ -4478,7 +4499,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st96", 9) == 0) { { -return dev_storage + 719; +return dev_storage + 720; } } @@ -4493,7 +4514,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st86", 9) == 0) { { -return dev_storage + 709; +return dev_storage + 710; } } @@ -4508,7 +4529,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st76", 9) == 0) { { -return dev_storage + 699; +return dev_storage + 700; } } @@ -4523,7 +4544,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st66", 9) == 0) { { -return dev_storage + 689; +return dev_storage + 690; } } @@ -4538,7 +4559,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st56", 9) == 0) { { -return dev_storage + 679; +return dev_storage + 680; } } @@ -4553,7 +4574,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st46", 9) == 0) { { -return dev_storage + 669; +return dev_storage + 670; } } @@ -4568,7 +4589,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st36", 9) == 0) { { -return dev_storage + 659; +return dev_storage + 660; } } @@ -4583,7 +4604,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st26", 9) == 0) { { -return dev_storage + 649; +return dev_storage + 650; } } @@ -4598,7 +4619,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st16", 9) == 0) { { -return dev_storage + 639; +return dev_storage + 640; } } @@ -4622,7 +4643,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz5", 9) == 0) { { -return dev_storage + 596; +return dev_storage + 597; } } @@ -4640,7 +4661,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty5", 9) == 0) { { -return dev_storage + 757; +return dev_storage + 758; } } @@ -4655,7 +4676,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy5", 9) == 0) { { -return dev_storage + 581; +return dev_storage + 582; } } @@ -4676,7 +4697,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx5", 9) == 0) { { -return dev_storage + 566; +return dev_storage + 567; } } @@ -4691,7 +4712,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw5", 9) == 0) { { -return dev_storage + 551; +return dev_storage + 552; } } @@ -4706,7 +4727,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv5", 9) == 0) { { -return dev_storage + 536; +return dev_storage + 537; } } @@ -4721,7 +4742,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu5", 9) == 0) { { -return dev_storage + 521; +return dev_storage + 522; } } @@ -4739,7 +4760,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt5", 9) == 0) { { -return dev_storage + 506; +return dev_storage + 507; } } @@ -4754,7 +4775,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst5", 9) == 0) { { -return dev_storage + 47; +return dev_storage + 48; } } @@ -4775,7 +4796,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds5", 9) == 0) { { -return dev_storage + 491; +return dev_storage + 492; } } @@ -4790,7 +4811,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr5", 9) == 0) { { -return dev_storage + 476; +return dev_storage + 477; } } @@ -4805,7 +4826,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq5", 9) == 0) { { -return dev_storage + 461; +return dev_storage + 462; } } @@ -4820,7 +4841,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp5", 9) == 0) { { -return dev_storage + 446; +return dev_storage + 447; } } @@ -4835,7 +4856,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo5", 9) == 0) { { -return dev_storage + 431; +return dev_storage + 432; } } @@ -4850,7 +4871,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn5", 9) == 0) { { -return dev_storage + 416; +return dev_storage + 417; } } @@ -4868,7 +4889,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm5", 9) == 0) { { -return dev_storage + 401; +return dev_storage + 402; } } @@ -4883,7 +4904,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com5", 9) == 0) { { -return dev_storage + 5; +return dev_storage + 6; } } @@ -4904,7 +4925,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl5", 9) == 0) { { -return dev_storage + 386; +return dev_storage + 387; } } @@ -4919,7 +4940,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk5", 9) == 0) { { -return dev_storage + 371; +return dev_storage + 372; } } @@ -4934,7 +4955,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj5", 9) == 0) { { -return dev_storage + 356; +return dev_storage + 357; } } @@ -4949,7 +4970,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi5", 9) == 0) { { -return dev_storage + 341; +return dev_storage + 342; } } @@ -4964,7 +4985,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh5", 9) == 0) { { -return dev_storage + 326; +return dev_storage + 327; } } @@ -4979,7 +5000,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg5", 9) == 0) { { -return dev_storage + 311; +return dev_storage + 312; } } @@ -4994,7 +5015,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf5", 9) == 0) { { -return dev_storage + 296; +return dev_storage + 297; } } @@ -5009,7 +5030,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde5", 9) == 0) { { -return dev_storage + 281; +return dev_storage + 282; } } @@ -5027,7 +5048,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd5", 9) == 0) { { -return dev_storage + 266; +return dev_storage + 267; } } @@ -5042,7 +5063,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd5", 9) == 0) { { -return dev_storage + 180; +return dev_storage + 181; } } @@ -5063,7 +5084,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc5", 9) == 0) { { -return dev_storage + 251; +return dev_storage + 252; } } @@ -5078,7 +5099,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb5", 9) == 0) { { -return dev_storage + 236; +return dev_storage + 237; } } @@ -5093,7 +5114,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda5", 9) == 0) { { -return dev_storage + 221; +return dev_storage + 222; } } @@ -5108,7 +5129,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st95", 9) == 0) { { -return dev_storage + 718; +return dev_storage + 719; } } @@ -5123,7 +5144,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st85", 9) == 0) { { -return dev_storage + 708; +return dev_storage + 709; } } @@ -5138,7 +5159,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st75", 9) == 0) { { -return dev_storage + 698; +return dev_storage + 699; } } @@ -5153,7 +5174,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st65", 9) == 0) { { -return dev_storage + 688; +return dev_storage + 689; } } @@ -5168,7 +5189,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st55", 9) == 0) { { -return dev_storage + 678; +return dev_storage + 679; } } @@ -5183,7 +5204,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st45", 9) == 0) { { -return dev_storage + 668; +return dev_storage + 669; } } @@ -5198,7 +5219,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st35", 9) == 0) { { -return dev_storage + 658; +return dev_storage + 659; } } @@ -5213,7 +5234,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st25", 9) == 0) { { -return dev_storage + 648; +return dev_storage + 649; } } @@ -5231,7 +5252,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st15", 9) == 0) { { -return dev_storage + 638; +return dev_storage + 639; } } @@ -5246,7 +5267,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr15", 9) == 0) { { -return dev_storage + 622; +return dev_storage + 623; } } @@ -5261,7 +5282,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd15", 9) == 0) { { -return dev_storage + 36; +return dev_storage + 37; } } @@ -5291,7 +5312,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz4", 9) == 0) { { -return dev_storage + 595; +return dev_storage + 596; } } @@ -5309,7 +5330,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty4", 9) == 0) { { -return dev_storage + 756; +return dev_storage + 757; } } @@ -5324,7 +5345,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy4", 9) == 0) { { -return dev_storage + 580; +return dev_storage + 581; } } @@ -5345,7 +5366,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx4", 9) == 0) { { -return dev_storage + 565; +return dev_storage + 566; } } @@ -5360,7 +5381,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw4", 9) == 0) { { -return dev_storage + 550; +return dev_storage + 551; } } @@ -5375,7 +5396,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv4", 9) == 0) { { -return dev_storage + 535; +return dev_storage + 536; } } @@ -5390,7 +5411,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu4", 9) == 0) { { -return dev_storage + 520; +return dev_storage + 521; } } @@ -5408,7 +5429,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt4", 9) == 0) { { -return dev_storage + 505; +return dev_storage + 506; } } @@ -5423,7 +5444,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst4", 9) == 0) { { -return dev_storage + 46; +return dev_storage + 47; } } @@ -5444,7 +5465,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds4", 9) == 0) { { -return dev_storage + 490; +return dev_storage + 491; } } @@ -5459,7 +5480,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr4", 9) == 0) { { -return dev_storage + 475; +return dev_storage + 476; } } @@ -5474,7 +5495,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq4", 9) == 0) { { -return dev_storage + 460; +return dev_storage + 461; } } @@ -5489,7 +5510,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp4", 9) == 0) { { -return dev_storage + 445; +return dev_storage + 446; } } @@ -5504,7 +5525,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo4", 9) == 0) { { -return dev_storage + 430; +return dev_storage + 431; } } @@ -5519,7 +5540,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn4", 9) == 0) { { -return dev_storage + 415; +return dev_storage + 416; } } @@ -5537,7 +5558,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm4", 9) == 0) { { -return dev_storage + 400; +return dev_storage + 401; } } @@ -5552,7 +5573,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com4", 9) == 0) { { -return dev_storage + 4; +return dev_storage + 5; } } @@ -5573,7 +5594,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl4", 9) == 0) { { -return dev_storage + 385; +return dev_storage + 386; } } @@ -5588,7 +5609,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk4", 9) == 0) { { -return dev_storage + 370; +return dev_storage + 371; } } @@ -5603,7 +5624,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj4", 9) == 0) { { -return dev_storage + 355; +return dev_storage + 356; } } @@ -5618,7 +5639,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi4", 9) == 0) { { -return dev_storage + 340; +return dev_storage + 341; } } @@ -5633,7 +5654,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh4", 9) == 0) { { -return dev_storage + 325; +return dev_storage + 326; } } @@ -5648,7 +5669,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg4", 9) == 0) { { -return dev_storage + 310; +return dev_storage + 311; } } @@ -5663,7 +5684,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf4", 9) == 0) { { -return dev_storage + 295; +return dev_storage + 296; } } @@ -5678,7 +5699,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde4", 9) == 0) { { -return dev_storage + 280; +return dev_storage + 281; } } @@ -5696,7 +5717,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd4", 9) == 0) { { -return dev_storage + 265; +return dev_storage + 266; } } @@ -5711,7 +5732,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd4", 9) == 0) { { -return dev_storage + 179; +return dev_storage + 180; } } @@ -5732,7 +5753,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc4", 9) == 0) { { -return dev_storage + 250; +return dev_storage + 251; } } @@ -5747,7 +5768,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb4", 9) == 0) { { -return dev_storage + 235; +return dev_storage + 236; } } @@ -5762,7 +5783,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda4", 9) == 0) { { -return dev_storage + 220; +return dev_storage + 221; } } @@ -5777,7 +5798,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st94", 9) == 0) { { -return dev_storage + 717; +return dev_storage + 718; } } @@ -5792,7 +5813,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st84", 9) == 0) { { -return dev_storage + 707; +return dev_storage + 708; } } @@ -5807,7 +5828,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st74", 9) == 0) { { -return dev_storage + 697; +return dev_storage + 698; } } @@ -5822,7 +5843,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st64", 9) == 0) { { -return dev_storage + 687; +return dev_storage + 688; } } @@ -5837,7 +5858,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st54", 9) == 0) { { -return dev_storage + 677; +return dev_storage + 678; } } @@ -5852,7 +5873,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st44", 9) == 0) { { -return dev_storage + 667; +return dev_storage + 668; } } @@ -5867,7 +5888,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st34", 9) == 0) { { -return dev_storage + 657; +return dev_storage + 658; } } @@ -5882,7 +5903,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st24", 9) == 0) { { -return dev_storage + 647; +return dev_storage + 648; } } @@ -5900,7 +5921,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st14", 9) == 0) { { -return dev_storage + 637; +return dev_storage + 638; } } @@ -5915,7 +5936,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr14", 9) == 0) { { -return dev_storage + 621; +return dev_storage + 622; } } @@ -5930,7 +5951,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd14", 9) == 0) { { -return dev_storage + 35; +return dev_storage + 36; } } @@ -5960,7 +5981,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz3", 9) == 0) { { -return dev_storage + 594; +return dev_storage + 595; } } @@ -5978,7 +5999,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty3", 9) == 0) { { -return dev_storage + 755; +return dev_storage + 756; } } @@ -5993,7 +6014,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy3", 9) == 0) { { -return dev_storage + 579; +return dev_storage + 580; } } @@ -6014,7 +6035,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx3", 9) == 0) { { -return dev_storage + 564; +return dev_storage + 565; } } @@ -6029,7 +6050,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw3", 9) == 0) { { -return dev_storage + 549; +return dev_storage + 550; } } @@ -6044,7 +6065,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv3", 9) == 0) { { -return dev_storage + 534; +return dev_storage + 535; } } @@ -6059,7 +6080,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu3", 9) == 0) { { -return dev_storage + 519; +return dev_storage + 520; } } @@ -6077,7 +6098,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt3", 9) == 0) { { -return dev_storage + 504; +return dev_storage + 505; } } @@ -6092,7 +6113,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst3", 9) == 0) { { -return dev_storage + 45; +return dev_storage + 46; } } @@ -6113,7 +6134,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds3", 9) == 0) { { -return dev_storage + 489; +return dev_storage + 490; } } @@ -6128,7 +6149,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr3", 9) == 0) { { -return dev_storage + 474; +return dev_storage + 475; } } @@ -6143,7 +6164,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq3", 9) == 0) { { -return dev_storage + 459; +return dev_storage + 460; } } @@ -6158,7 +6179,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp3", 9) == 0) { { -return dev_storage + 444; +return dev_storage + 445; } } @@ -6173,7 +6194,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo3", 9) == 0) { { -return dev_storage + 429; +return dev_storage + 430; } } @@ -6188,7 +6209,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn3", 9) == 0) { { -return dev_storage + 414; +return dev_storage + 415; } } @@ -6206,7 +6227,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm3", 9) == 0) { { -return dev_storage + 399; +return dev_storage + 400; } } @@ -6221,7 +6242,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com3", 9) == 0) { { -return dev_storage + 3; +return dev_storage + 4; } } @@ -6242,7 +6263,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl3", 9) == 0) { { -return dev_storage + 384; +return dev_storage + 385; } } @@ -6257,7 +6278,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk3", 9) == 0) { { -return dev_storage + 369; +return dev_storage + 370; } } @@ -6272,7 +6293,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj3", 9) == 0) { { -return dev_storage + 354; +return dev_storage + 355; } } @@ -6287,7 +6308,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi3", 9) == 0) { { -return dev_storage + 339; +return dev_storage + 340; } } @@ -6302,7 +6323,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh3", 9) == 0) { { -return dev_storage + 324; +return dev_storage + 325; } } @@ -6317,7 +6338,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg3", 9) == 0) { { -return dev_storage + 309; +return dev_storage + 310; } } @@ -6332,7 +6353,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf3", 9) == 0) { { -return dev_storage + 294; +return dev_storage + 295; } } @@ -6347,7 +6368,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde3", 9) == 0) { { -return dev_storage + 279; +return dev_storage + 280; } } @@ -6365,7 +6386,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd3", 9) == 0) { { -return dev_storage + 264; +return dev_storage + 265; } } @@ -6380,7 +6401,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd3", 9) == 0) { { -return dev_storage + 178; +return dev_storage + 179; } } @@ -6401,7 +6422,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc3", 9) == 0) { { -return dev_storage + 249; +return dev_storage + 250; } } @@ -6416,7 +6437,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb3", 9) == 0) { { -return dev_storage + 234; +return dev_storage + 235; } } @@ -6431,7 +6452,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda3", 9) == 0) { { -return dev_storage + 219; +return dev_storage + 220; } } @@ -6446,7 +6467,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st93", 9) == 0) { { -return dev_storage + 716; +return dev_storage + 717; } } @@ -6461,7 +6482,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st83", 9) == 0) { { -return dev_storage + 706; +return dev_storage + 707; } } @@ -6476,7 +6497,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st73", 9) == 0) { { -return dev_storage + 696; +return dev_storage + 697; } } @@ -6491,7 +6512,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st63", 9) == 0) { { -return dev_storage + 686; +return dev_storage + 687; } } @@ -6506,7 +6527,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st53", 9) == 0) { { -return dev_storage + 676; +return dev_storage + 677; } } @@ -6521,7 +6542,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st43", 9) == 0) { { -return dev_storage + 666; +return dev_storage + 667; } } @@ -6536,7 +6557,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st33", 9) == 0) { { -return dev_storage + 656; +return dev_storage + 657; } } @@ -6551,7 +6572,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st23", 9) == 0) { { -return dev_storage + 646; +return dev_storage + 647; } } @@ -6569,7 +6590,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st13", 9) == 0) { { -return dev_storage + 636; +return dev_storage + 637; } } @@ -6584,7 +6605,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr13", 9) == 0) { { -return dev_storage + 620; +return dev_storage + 621; } } @@ -6599,7 +6620,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd13", 9) == 0) { { -return dev_storage + 34; +return dev_storage + 35; } } @@ -6629,7 +6650,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz2", 9) == 0) { { -return dev_storage + 593; +return dev_storage + 594; } } @@ -6647,7 +6668,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty2", 9) == 0) { { -return dev_storage + 754; +return dev_storage + 755; } } @@ -6662,7 +6683,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy2", 9) == 0) { { -return dev_storage + 578; +return dev_storage + 579; } } @@ -6683,7 +6704,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx2", 9) == 0) { { -return dev_storage + 563; +return dev_storage + 564; } } @@ -6698,7 +6719,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw2", 9) == 0) { { -return dev_storage + 548; +return dev_storage + 549; } } @@ -6713,7 +6734,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv2", 9) == 0) { { -return dev_storage + 533; +return dev_storage + 534; } } @@ -6728,7 +6749,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu2", 9) == 0) { { -return dev_storage + 518; +return dev_storage + 519; } } @@ -6746,7 +6767,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt2", 9) == 0) { { -return dev_storage + 503; +return dev_storage + 504; } } @@ -6761,7 +6782,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst2", 9) == 0) { { -return dev_storage + 44; +return dev_storage + 45; } } @@ -6782,7 +6803,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds2", 9) == 0) { { -return dev_storage + 488; +return dev_storage + 489; } } @@ -6797,7 +6818,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr2", 9) == 0) { { -return dev_storage + 473; +return dev_storage + 474; } } @@ -6812,7 +6833,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq2", 9) == 0) { { -return dev_storage + 458; +return dev_storage + 459; } } @@ -6827,7 +6848,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp2", 9) == 0) { { -return dev_storage + 443; +return dev_storage + 444; } } @@ -6842,7 +6863,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo2", 9) == 0) { { -return dev_storage + 428; +return dev_storage + 429; } } @@ -6857,7 +6878,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn2", 9) == 0) { { -return dev_storage + 413; +return dev_storage + 414; } } @@ -6875,7 +6896,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm2", 9) == 0) { { -return dev_storage + 398; +return dev_storage + 399; } } @@ -6890,7 +6911,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com2", 9) == 0) { { -return dev_storage + 2; +return dev_storage + 3; } } @@ -6911,7 +6932,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl2", 9) == 0) { { -return dev_storage + 383; +return dev_storage + 384; } } @@ -6926,7 +6947,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk2", 9) == 0) { { -return dev_storage + 368; +return dev_storage + 369; } } @@ -6941,7 +6962,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj2", 9) == 0) { { -return dev_storage + 353; +return dev_storage + 354; } } @@ -6956,7 +6977,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi2", 9) == 0) { { -return dev_storage + 338; +return dev_storage + 339; } } @@ -6971,7 +6992,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh2", 9) == 0) { { -return dev_storage + 323; +return dev_storage + 324; } } @@ -6986,7 +7007,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg2", 9) == 0) { { -return dev_storage + 308; +return dev_storage + 309; } } @@ -7001,7 +7022,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf2", 9) == 0) { { -return dev_storage + 293; +return dev_storage + 294; } } @@ -7016,7 +7037,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde2", 9) == 0) { { -return dev_storage + 278; +return dev_storage + 279; } } @@ -7034,7 +7055,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd2", 9) == 0) { { -return dev_storage + 263; +return dev_storage + 264; } } @@ -7049,7 +7070,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd2", 9) == 0) { { -return dev_storage + 177; +return dev_storage + 178; } } @@ -7070,7 +7091,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc2", 9) == 0) { { -return dev_storage + 248; +return dev_storage + 249; } } @@ -7085,7 +7106,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb2", 9) == 0) { { -return dev_storage + 233; +return dev_storage + 234; } } @@ -7100,7 +7121,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda2", 9) == 0) { { -return dev_storage + 218; +return dev_storage + 219; } } @@ -7115,7 +7136,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st92", 9) == 0) { { -return dev_storage + 715; +return dev_storage + 716; } } @@ -7130,7 +7151,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st82", 9) == 0) { { -return dev_storage + 705; +return dev_storage + 706; } } @@ -7145,7 +7166,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st72", 9) == 0) { { -return dev_storage + 695; +return dev_storage + 696; } } @@ -7160,7 +7181,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st62", 9) == 0) { { -return dev_storage + 685; +return dev_storage + 686; } } @@ -7175,7 +7196,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st52", 9) == 0) { { -return dev_storage + 675; +return dev_storage + 676; } } @@ -7190,7 +7211,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st42", 9) == 0) { { -return dev_storage + 665; +return dev_storage + 666; } } @@ -7205,7 +7226,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st32", 9) == 0) { { -return dev_storage + 655; +return dev_storage + 656; } } @@ -7220,7 +7241,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st22", 9) == 0) { { -return dev_storage + 645; +return dev_storage + 646; } } @@ -7238,7 +7259,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st12", 9) == 0) { { -return dev_storage + 635; +return dev_storage + 636; } } @@ -7253,7 +7274,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr12", 9) == 0) { { -return dev_storage + 619; +return dev_storage + 620; } } @@ -7268,7 +7289,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd12", 9) == 0) { { -return dev_storage + 33; +return dev_storage + 34; } } @@ -7298,7 +7319,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz1", 9) == 0) { { -return dev_storage + 592; +return dev_storage + 593; } } @@ -7316,7 +7337,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty1", 9) == 0) { { -return dev_storage + 753; +return dev_storage + 754; } } @@ -7331,7 +7352,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy1", 9) == 0) { { -return dev_storage + 577; +return dev_storage + 578; } } @@ -7352,7 +7373,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx1", 9) == 0) { { -return dev_storage + 562; +return dev_storage + 563; } } @@ -7367,7 +7388,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw1", 9) == 0) { { -return dev_storage + 547; +return dev_storage + 548; } } @@ -7382,7 +7403,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv1", 9) == 0) { { -return dev_storage + 532; +return dev_storage + 533; } } @@ -7397,7 +7418,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu1", 9) == 0) { { -return dev_storage + 517; +return dev_storage + 518; } } @@ -7415,7 +7436,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt1", 9) == 0) { { -return dev_storage + 502; +return dev_storage + 503; } } @@ -7430,7 +7451,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst1", 9) == 0) { { -return dev_storage + 43; +return dev_storage + 44; } } @@ -7451,7 +7472,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds1", 9) == 0) { { -return dev_storage + 487; +return dev_storage + 488; } } @@ -7466,7 +7487,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr1", 9) == 0) { { -return dev_storage + 472; +return dev_storage + 473; } } @@ -7481,7 +7502,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq1", 9) == 0) { { -return dev_storage + 457; +return dev_storage + 458; } } @@ -7496,7 +7517,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp1", 9) == 0) { { -return dev_storage + 442; +return dev_storage + 443; } } @@ -7511,7 +7532,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo1", 9) == 0) { { -return dev_storage + 427; +return dev_storage + 428; } } @@ -7526,7 +7547,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn1", 9) == 0) { { -return dev_storage + 412; +return dev_storage + 413; } } @@ -7544,7 +7565,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm1", 9) == 0) { { -return dev_storage + 397; +return dev_storage + 398; } } @@ -7559,7 +7580,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com1", 9) == 0) { { -return dev_storage + 1; +return dev_storage + 2; } } @@ -7580,7 +7601,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl1", 9) == 0) { { -return dev_storage + 382; +return dev_storage + 383; } } @@ -7595,7 +7616,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk1", 9) == 0) { { -return dev_storage + 367; +return dev_storage + 368; } } @@ -7610,7 +7631,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj1", 9) == 0) { { -return dev_storage + 352; +return dev_storage + 353; } } @@ -7625,7 +7646,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi1", 9) == 0) { { -return dev_storage + 337; +return dev_storage + 338; } } @@ -7640,7 +7661,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh1", 9) == 0) { { -return dev_storage + 322; +return dev_storage + 323; } } @@ -7655,7 +7676,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg1", 9) == 0) { { -return dev_storage + 307; +return dev_storage + 308; } } @@ -7670,7 +7691,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf1", 9) == 0) { { -return dev_storage + 292; +return dev_storage + 293; } } @@ -7685,7 +7706,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde1", 9) == 0) { { -return dev_storage + 277; +return dev_storage + 278; } } @@ -7703,7 +7724,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd1", 9) == 0) { { -return dev_storage + 262; +return dev_storage + 263; } } @@ -7718,7 +7739,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd1", 9) == 0) { { -return dev_storage + 176; +return dev_storage + 177; } } @@ -7739,7 +7760,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc1", 9) == 0) { { -return dev_storage + 247; +return dev_storage + 248; } } @@ -7754,7 +7775,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb1", 9) == 0) { { -return dev_storage + 232; +return dev_storage + 233; } } @@ -7769,7 +7790,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda1", 9) == 0) { { -return dev_storage + 217; +return dev_storage + 218; } } @@ -7784,7 +7805,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st91", 9) == 0) { { -return dev_storage + 714; +return dev_storage + 715; } } @@ -7799,7 +7820,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st81", 9) == 0) { { -return dev_storage + 704; +return dev_storage + 705; } } @@ -7814,7 +7835,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st71", 9) == 0) { { -return dev_storage + 694; +return dev_storage + 695; } } @@ -7829,7 +7850,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st61", 9) == 0) { { -return dev_storage + 684; +return dev_storage + 685; } } @@ -7844,7 +7865,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st51", 9) == 0) { { -return dev_storage + 674; +return dev_storage + 675; } } @@ -7859,7 +7880,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st41", 9) == 0) { { -return dev_storage + 664; +return dev_storage + 665; } } @@ -7874,7 +7895,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st31", 9) == 0) { { -return dev_storage + 654; +return dev_storage + 655; } } @@ -7889,7 +7910,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st21", 9) == 0) { { -return dev_storage + 644; +return dev_storage + 645; } } @@ -7907,7 +7928,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st11", 9) == 0) { { -return dev_storage + 634; +return dev_storage + 635; } } @@ -7922,7 +7943,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr11", 9) == 0) { { -return dev_storage + 618; +return dev_storage + 619; } } @@ -7937,7 +7958,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd11", 9) == 0) { { -return dev_storage + 32; +return dev_storage + 33; } } @@ -7967,7 +7988,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty0", 9) == 0) { { -return dev_storage + 752; +return dev_storage + 753; } } @@ -7982,7 +8003,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst0", 9) == 0) { { -return dev_storage + 42; +return dev_storage + 43; } } @@ -7997,7 +8018,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd0", 9) == 0) { { -return dev_storage + 175; +return dev_storage + 176; } } @@ -8012,7 +8033,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st90", 9) == 0) { { -return dev_storage + 713; +return dev_storage + 714; } } @@ -8027,7 +8048,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st80", 9) == 0) { { -return dev_storage + 703; +return dev_storage + 704; } } @@ -8042,7 +8063,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st70", 9) == 0) { { -return dev_storage + 693; +return dev_storage + 694; } } @@ -8057,7 +8078,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st60", 9) == 0) { { -return dev_storage + 683; +return dev_storage + 684; } } @@ -8072,7 +8093,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st50", 9) == 0) { { -return dev_storage + 673; +return dev_storage + 674; } } @@ -8087,7 +8108,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st40", 9) == 0) { { -return dev_storage + 663; +return dev_storage + 664; } } @@ -8102,7 +8123,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st30", 9) == 0) { { -return dev_storage + 653; +return dev_storage + 654; } } @@ -8117,7 +8138,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st20", 9) == 0) { { -return dev_storage + 643; +return dev_storage + 644; } } @@ -8135,7 +8156,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st10", 9) == 0) { { -return dev_storage + 633; +return dev_storage + 634; } } @@ -8150,7 +8171,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sr10", 9) == 0) { { -return dev_storage + 617; +return dev_storage + 618; } } @@ -8165,7 +8186,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/fd10", 9) == 0) { { -return dev_storage + 31; +return dev_storage + 32; } } @@ -8201,7 +8222,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/conin", 10) == 0) { { -return dev_storage + 17; +return dev_storage + 18; } } @@ -8219,7 +8240,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS9", 10) == 0) { { -return dev_storage + 825; +return dev_storage + 826; } } @@ -8234,7 +8255,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst99", 10) == 0) { { -return dev_storage + 141; +return dev_storage + 142; } } @@ -8249,7 +8270,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst89", 10) == 0) { { -return dev_storage + 131; +return dev_storage + 132; } } @@ -8264,7 +8285,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst79", 10) == 0) { { -return dev_storage + 121; +return dev_storage + 122; } } @@ -8279,7 +8300,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst69", 10) == 0) { { -return dev_storage + 111; +return dev_storage + 112; } } @@ -8297,7 +8318,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty59", 10) == 0) { { -return dev_storage + 811; +return dev_storage + 812; } } @@ -8312,7 +8333,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst59", 10) == 0) { { -return dev_storage + 101; +return dev_storage + 102; } } @@ -8336,7 +8357,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty49", 10) == 0) { { -return dev_storage + 801; +return dev_storage + 802; } } @@ -8351,7 +8372,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst49", 10) == 0) { { -return dev_storage + 91; +return dev_storage + 92; } } @@ -8375,7 +8396,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty39", 10) == 0) { { -return dev_storage + 791; +return dev_storage + 792; } } @@ -8390,7 +8411,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst39", 10) == 0) { { -return dev_storage + 81; +return dev_storage + 82; } } @@ -8414,7 +8435,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty29", 10) == 0) { { -return dev_storage + 781; +return dev_storage + 782; } } @@ -8429,7 +8450,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst29", 10) == 0) { { -return dev_storage + 71; +return dev_storage + 72; } } @@ -8453,7 +8474,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty19", 10) == 0) { { -return dev_storage + 771; +return dev_storage + 772; } } @@ -8468,7 +8489,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st119", 10) == 0) { { -return dev_storage + 742; +return dev_storage + 743; } } @@ -8483,7 +8504,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst19", 10) == 0) { { -return dev_storage + 61; +return dev_storage + 62; } } @@ -8504,7 +8525,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st109", 10) == 0) { { -return dev_storage + 732; +return dev_storage + 733; } } @@ -8528,7 +8549,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS8", 10) == 0) { { -return dev_storage + 824; +return dev_storage + 825; } } @@ -8543,7 +8564,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst98", 10) == 0) { { -return dev_storage + 140; +return dev_storage + 141; } } @@ -8558,7 +8579,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst88", 10) == 0) { { -return dev_storage + 130; +return dev_storage + 131; } } @@ -8573,7 +8594,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst78", 10) == 0) { { -return dev_storage + 120; +return dev_storage + 121; } } @@ -8588,7 +8609,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst68", 10) == 0) { { -return dev_storage + 110; +return dev_storage + 111; } } @@ -8606,7 +8627,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty58", 10) == 0) { { -return dev_storage + 810; +return dev_storage + 811; } } @@ -8621,7 +8642,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst58", 10) == 0) { { -return dev_storage + 100; +return dev_storage + 101; } } @@ -8645,7 +8666,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty48", 10) == 0) { { -return dev_storage + 800; +return dev_storage + 801; } } @@ -8660,7 +8681,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst48", 10) == 0) { { -return dev_storage + 90; +return dev_storage + 91; } } @@ -8684,7 +8705,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty38", 10) == 0) { { -return dev_storage + 790; +return dev_storage + 791; } } @@ -8699,7 +8720,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst38", 10) == 0) { { -return dev_storage + 80; +return dev_storage + 81; } } @@ -8723,7 +8744,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty28", 10) == 0) { { -return dev_storage + 780; +return dev_storage + 781; } } @@ -8738,7 +8759,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst28", 10) == 0) { { -return dev_storage + 70; +return dev_storage + 71; } } @@ -8762,7 +8783,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty18", 10) == 0) { { -return dev_storage + 770; +return dev_storage + 771; } } @@ -8777,7 +8798,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st118", 10) == 0) { { -return dev_storage + 741; +return dev_storage + 742; } } @@ -8792,7 +8813,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst18", 10) == 0) { { -return dev_storage + 60; +return dev_storage + 61; } } @@ -8813,7 +8834,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st108", 10) == 0) { { -return dev_storage + 731; +return dev_storage + 732; } } @@ -8837,7 +8858,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS7", 10) == 0) { { -return dev_storage + 823; +return dev_storage + 824; } } @@ -8852,7 +8873,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst97", 10) == 0) { { -return dev_storage + 139; +return dev_storage + 140; } } @@ -8867,7 +8888,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst87", 10) == 0) { { -return dev_storage + 129; +return dev_storage + 130; } } @@ -8882,7 +8903,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst77", 10) == 0) { { -return dev_storage + 119; +return dev_storage + 120; } } @@ -8897,7 +8918,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst67", 10) == 0) { { -return dev_storage + 109; +return dev_storage + 110; } } @@ -8915,7 +8936,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty57", 10) == 0) { { -return dev_storage + 809; +return dev_storage + 810; } } @@ -8930,7 +8951,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst57", 10) == 0) { { -return dev_storage + 99; +return dev_storage + 100; } } @@ -8954,7 +8975,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty47", 10) == 0) { { -return dev_storage + 799; +return dev_storage + 800; } } @@ -8969,7 +8990,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst47", 10) == 0) { { -return dev_storage + 89; +return dev_storage + 90; } } @@ -8993,7 +9014,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty37", 10) == 0) { { -return dev_storage + 789; +return dev_storage + 790; } } @@ -9008,7 +9029,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst37", 10) == 0) { { -return dev_storage + 79; +return dev_storage + 80; } } @@ -9032,7 +9053,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty27", 10) == 0) { { -return dev_storage + 779; +return dev_storage + 780; } } @@ -9047,7 +9068,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st127", 10) == 0) { { -return dev_storage + 750; +return dev_storage + 751; } } @@ -9062,7 +9083,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst27", 10) == 0) { { -return dev_storage + 69; +return dev_storage + 70; } } @@ -9086,7 +9107,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty17", 10) == 0) { { -return dev_storage + 769; +return dev_storage + 770; } } @@ -9101,7 +9122,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st117", 10) == 0) { { -return dev_storage + 740; +return dev_storage + 741; } } @@ -9116,7 +9137,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst17", 10) == 0) { { -return dev_storage + 59; +return dev_storage + 60; } } @@ -9137,7 +9158,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st107", 10) == 0) { { -return dev_storage + 730; +return dev_storage + 731; } } @@ -9161,7 +9182,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS6", 10) == 0) { { -return dev_storage + 822; +return dev_storage + 823; } } @@ -9176,7 +9197,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst96", 10) == 0) { { -return dev_storage + 138; +return dev_storage + 139; } } @@ -9191,7 +9212,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst86", 10) == 0) { { -return dev_storage + 128; +return dev_storage + 129; } } @@ -9206,7 +9227,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst76", 10) == 0) { { -return dev_storage + 118; +return dev_storage + 119; } } @@ -9221,7 +9242,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst66", 10) == 0) { { -return dev_storage + 108; +return dev_storage + 109; } } @@ -9239,7 +9260,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty56", 10) == 0) { { -return dev_storage + 808; +return dev_storage + 809; } } @@ -9254,7 +9275,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst56", 10) == 0) { { -return dev_storage + 98; +return dev_storage + 99; } } @@ -9278,7 +9299,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty46", 10) == 0) { { -return dev_storage + 798; +return dev_storage + 799; } } @@ -9293,7 +9314,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst46", 10) == 0) { { -return dev_storage + 88; +return dev_storage + 89; } } @@ -9317,7 +9338,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty36", 10) == 0) { { -return dev_storage + 788; +return dev_storage + 789; } } @@ -9332,7 +9353,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst36", 10) == 0) { { -return dev_storage + 78; +return dev_storage + 79; } } @@ -9356,7 +9377,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty26", 10) == 0) { { -return dev_storage + 778; +return dev_storage + 779; } } @@ -9371,7 +9392,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st126", 10) == 0) { { -return dev_storage + 749; +return dev_storage + 750; } } @@ -9386,7 +9407,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst26", 10) == 0) { { -return dev_storage + 68; +return dev_storage + 69; } } @@ -9410,7 +9431,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty16", 10) == 0) { { -return dev_storage + 768; +return dev_storage + 769; } } @@ -9425,7 +9446,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st116", 10) == 0) { { -return dev_storage + 739; +return dev_storage + 740; } } @@ -9440,7 +9461,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst16", 10) == 0) { { -return dev_storage + 58; +return dev_storage + 59; } } @@ -9455,7 +9476,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com16", 10) == 0) { { -return dev_storage + 16; +return dev_storage + 17; } } @@ -9476,7 +9497,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st106", 10) == 0) { { -return dev_storage + 729; +return dev_storage + 730; } } @@ -9500,7 +9521,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz15", 10) == 0) { { -return dev_storage + 606; +return dev_storage + 607; } } @@ -9518,7 +9539,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS5", 10) == 0) { { -return dev_storage + 821; +return dev_storage + 822; } } @@ -9533,7 +9554,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty55", 10) == 0) { { -return dev_storage + 807; +return dev_storage + 808; } } @@ -9548,7 +9569,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty45", 10) == 0) { { -return dev_storage + 797; +return dev_storage + 798; } } @@ -9563,7 +9584,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty35", 10) == 0) { { -return dev_storage + 787; +return dev_storage + 788; } } @@ -9578,7 +9599,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty25", 10) == 0) { { -return dev_storage + 777; +return dev_storage + 778; } } @@ -9596,7 +9617,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty15", 10) == 0) { { -return dev_storage + 767; +return dev_storage + 768; } } @@ -9611,7 +9632,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy15", 10) == 0) { { -return dev_storage + 591; +return dev_storage + 592; } } @@ -9638,7 +9659,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx15", 10) == 0) { { -return dev_storage + 576; +return dev_storage + 577; } } @@ -9653,7 +9674,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw15", 10) == 0) { { -return dev_storage + 561; +return dev_storage + 562; } } @@ -9668,7 +9689,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv15", 10) == 0) { { -return dev_storage + 546; +return dev_storage + 547; } } @@ -9683,7 +9704,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu15", 10) == 0) { { -return dev_storage + 531; +return dev_storage + 532; } } @@ -9701,7 +9722,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst95", 10) == 0) { { -return dev_storage + 137; +return dev_storage + 138; } } @@ -9716,7 +9737,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst85", 10) == 0) { { -return dev_storage + 127; +return dev_storage + 128; } } @@ -9731,7 +9752,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst75", 10) == 0) { { -return dev_storage + 117; +return dev_storage + 118; } } @@ -9746,7 +9767,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst65", 10) == 0) { { -return dev_storage + 107; +return dev_storage + 108; } } @@ -9761,7 +9782,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst55", 10) == 0) { { -return dev_storage + 97; +return dev_storage + 98; } } @@ -9776,7 +9797,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst45", 10) == 0) { { -return dev_storage + 87; +return dev_storage + 88; } } @@ -9791,7 +9812,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst35", 10) == 0) { { -return dev_storage + 77; +return dev_storage + 78; } } @@ -9806,7 +9827,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst25", 10) == 0) { { -return dev_storage + 67; +return dev_storage + 68; } } @@ -9824,7 +9845,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt15", 10) == 0) { { -return dev_storage + 516; +return dev_storage + 517; } } @@ -9839,7 +9860,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst15", 10) == 0) { { -return dev_storage + 57; +return dev_storage + 58; } } @@ -9866,7 +9887,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds15", 10) == 0) { { -return dev_storage + 501; +return dev_storage + 502; } } @@ -9881,7 +9902,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr15", 10) == 0) { { -return dev_storage + 486; +return dev_storage + 487; } } @@ -9896,7 +9917,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq15", 10) == 0) { { -return dev_storage + 471; +return dev_storage + 472; } } @@ -9911,7 +9932,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp15", 10) == 0) { { -return dev_storage + 456; +return dev_storage + 457; } } @@ -9926,7 +9947,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo15", 10) == 0) { { -return dev_storage + 441; +return dev_storage + 442; } } @@ -9941,7 +9962,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn15", 10) == 0) { { -return dev_storage + 426; +return dev_storage + 427; } } @@ -9959,7 +9980,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm15", 10) == 0) { { -return dev_storage + 411; +return dev_storage + 412; } } @@ -9974,7 +9995,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com15", 10) == 0) { { -return dev_storage + 15; +return dev_storage + 16; } } @@ -9995,7 +10016,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl15", 10) == 0) { { -return dev_storage + 396; +return dev_storage + 397; } } @@ -10010,7 +10031,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk15", 10) == 0) { { -return dev_storage + 381; +return dev_storage + 382; } } @@ -10025,7 +10046,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj15", 10) == 0) { { -return dev_storage + 366; +return dev_storage + 367; } } @@ -10040,7 +10061,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi15", 10) == 0) { { -return dev_storage + 351; +return dev_storage + 352; } } @@ -10055,7 +10076,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh15", 10) == 0) { { -return dev_storage + 336; +return dev_storage + 337; } } @@ -10070,7 +10091,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg15", 10) == 0) { { -return dev_storage + 321; +return dev_storage + 322; } } @@ -10085,7 +10106,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf15", 10) == 0) { { -return dev_storage + 306; +return dev_storage + 307; } } @@ -10100,7 +10121,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde15", 10) == 0) { { -return dev_storage + 291; +return dev_storage + 292; } } @@ -10118,7 +10139,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd15", 10) == 0) { { -return dev_storage + 276; +return dev_storage + 277; } } @@ -10133,7 +10154,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd15", 10) == 0) { { -return dev_storage + 190; +return dev_storage + 191; } } @@ -10154,7 +10175,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc15", 10) == 0) { { -return dev_storage + 261; +return dev_storage + 262; } } @@ -10169,7 +10190,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb15", 10) == 0) { { -return dev_storage + 246; +return dev_storage + 247; } } @@ -10184,7 +10205,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda15", 10) == 0) { { -return dev_storage + 231; +return dev_storage + 232; } } @@ -10202,7 +10223,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st125", 10) == 0) { { -return dev_storage + 748; +return dev_storage + 749; } } @@ -10217,7 +10238,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st115", 10) == 0) { { -return dev_storage + 738; +return dev_storage + 739; } } @@ -10232,7 +10253,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st105", 10) == 0) { { -return dev_storage + 728; +return dev_storage + 729; } } @@ -10262,7 +10283,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz14", 10) == 0) { { -return dev_storage + 605; +return dev_storage + 606; } } @@ -10280,7 +10301,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS4", 10) == 0) { { -return dev_storage + 820; +return dev_storage + 821; } } @@ -10295,7 +10316,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty54", 10) == 0) { { -return dev_storage + 806; +return dev_storage + 807; } } @@ -10310,7 +10331,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty44", 10) == 0) { { -return dev_storage + 796; +return dev_storage + 797; } } @@ -10325,7 +10346,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty34", 10) == 0) { { -return dev_storage + 786; +return dev_storage + 787; } } @@ -10340,7 +10361,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty24", 10) == 0) { { -return dev_storage + 776; +return dev_storage + 777; } } @@ -10358,7 +10379,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty14", 10) == 0) { { -return dev_storage + 766; +return dev_storage + 767; } } @@ -10373,7 +10394,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy14", 10) == 0) { { -return dev_storage + 590; +return dev_storage + 591; } } @@ -10400,7 +10421,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx14", 10) == 0) { { -return dev_storage + 575; +return dev_storage + 576; } } @@ -10415,7 +10436,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw14", 10) == 0) { { -return dev_storage + 560; +return dev_storage + 561; } } @@ -10430,7 +10451,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv14", 10) == 0) { { -return dev_storage + 545; +return dev_storage + 546; } } @@ -10445,7 +10466,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu14", 10) == 0) { { -return dev_storage + 530; +return dev_storage + 531; } } @@ -10463,7 +10484,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst94", 10) == 0) { { -return dev_storage + 136; +return dev_storage + 137; } } @@ -10478,7 +10499,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst84", 10) == 0) { { -return dev_storage + 126; +return dev_storage + 127; } } @@ -10493,7 +10514,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst74", 10) == 0) { { -return dev_storage + 116; +return dev_storage + 117; } } @@ -10508,7 +10529,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst64", 10) == 0) { { -return dev_storage + 106; +return dev_storage + 107; } } @@ -10523,7 +10544,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst54", 10) == 0) { { -return dev_storage + 96; +return dev_storage + 97; } } @@ -10538,7 +10559,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst44", 10) == 0) { { -return dev_storage + 86; +return dev_storage + 87; } } @@ -10553,7 +10574,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst34", 10) == 0) { { -return dev_storage + 76; +return dev_storage + 77; } } @@ -10568,7 +10589,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst24", 10) == 0) { { -return dev_storage + 66; +return dev_storage + 67; } } @@ -10586,7 +10607,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt14", 10) == 0) { { -return dev_storage + 515; +return dev_storage + 516; } } @@ -10601,7 +10622,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst14", 10) == 0) { { -return dev_storage + 56; +return dev_storage + 57; } } @@ -10628,7 +10649,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds14", 10) == 0) { { -return dev_storage + 500; +return dev_storage + 501; } } @@ -10643,7 +10664,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr14", 10) == 0) { { -return dev_storage + 485; +return dev_storage + 486; } } @@ -10658,7 +10679,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq14", 10) == 0) { { -return dev_storage + 470; +return dev_storage + 471; } } @@ -10673,7 +10694,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp14", 10) == 0) { { -return dev_storage + 455; +return dev_storage + 456; } } @@ -10688,7 +10709,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo14", 10) == 0) { { -return dev_storage + 440; +return dev_storage + 441; } } @@ -10703,7 +10724,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn14", 10) == 0) { { -return dev_storage + 425; +return dev_storage + 426; } } @@ -10721,7 +10742,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm14", 10) == 0) { { -return dev_storage + 410; +return dev_storage + 411; } } @@ -10736,7 +10757,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com14", 10) == 0) { { -return dev_storage + 14; +return dev_storage + 15; } } @@ -10757,7 +10778,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl14", 10) == 0) { { -return dev_storage + 395; +return dev_storage + 396; } } @@ -10772,7 +10793,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk14", 10) == 0) { { -return dev_storage + 380; +return dev_storage + 381; } } @@ -10787,7 +10808,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj14", 10) == 0) { { -return dev_storage + 365; +return dev_storage + 366; } } @@ -10802,7 +10823,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi14", 10) == 0) { { -return dev_storage + 350; +return dev_storage + 351; } } @@ -10817,7 +10838,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh14", 10) == 0) { { -return dev_storage + 335; +return dev_storage + 336; } } @@ -10832,7 +10853,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg14", 10) == 0) { { -return dev_storage + 320; +return dev_storage + 321; } } @@ -10847,7 +10868,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf14", 10) == 0) { { -return dev_storage + 305; +return dev_storage + 306; } } @@ -10862,7 +10883,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde14", 10) == 0) { { -return dev_storage + 290; +return dev_storage + 291; } } @@ -10880,7 +10901,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd14", 10) == 0) { { -return dev_storage + 275; +return dev_storage + 276; } } @@ -10895,7 +10916,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd14", 10) == 0) { { -return dev_storage + 189; +return dev_storage + 190; } } @@ -10916,7 +10937,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc14", 10) == 0) { { -return dev_storage + 260; +return dev_storage + 261; } } @@ -10931,7 +10952,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb14", 10) == 0) { { -return dev_storage + 245; +return dev_storage + 246; } } @@ -10946,7 +10967,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda14", 10) == 0) { { -return dev_storage + 230; +return dev_storage + 231; } } @@ -10964,7 +10985,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st124", 10) == 0) { { -return dev_storage + 747; +return dev_storage + 748; } } @@ -10979,7 +11000,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st114", 10) == 0) { { -return dev_storage + 737; +return dev_storage + 738; } } @@ -10994,7 +11015,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st104", 10) == 0) { { -return dev_storage + 727; +return dev_storage + 728; } } @@ -11024,7 +11045,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz13", 10) == 0) { { -return dev_storage + 604; +return dev_storage + 605; } } @@ -11042,7 +11063,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS3", 10) == 0) { { -return dev_storage + 819; +return dev_storage + 820; } } @@ -11057,7 +11078,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty63", 10) == 0) { { -return dev_storage + 815; +return dev_storage + 816; } } @@ -11072,7 +11093,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty53", 10) == 0) { { -return dev_storage + 805; +return dev_storage + 806; } } @@ -11087,7 +11108,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty43", 10) == 0) { { -return dev_storage + 795; +return dev_storage + 796; } } @@ -11102,7 +11123,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty33", 10) == 0) { { -return dev_storage + 785; +return dev_storage + 786; } } @@ -11117,7 +11138,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty23", 10) == 0) { { -return dev_storage + 775; +return dev_storage + 776; } } @@ -11135,7 +11156,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty13", 10) == 0) { { -return dev_storage + 765; +return dev_storage + 766; } } @@ -11150,7 +11171,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy13", 10) == 0) { { -return dev_storage + 589; +return dev_storage + 590; } } @@ -11177,7 +11198,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx13", 10) == 0) { { -return dev_storage + 574; +return dev_storage + 575; } } @@ -11192,7 +11213,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw13", 10) == 0) { { -return dev_storage + 559; +return dev_storage + 560; } } @@ -11207,7 +11228,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv13", 10) == 0) { { -return dev_storage + 544; +return dev_storage + 545; } } @@ -11222,7 +11243,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu13", 10) == 0) { { -return dev_storage + 529; +return dev_storage + 530; } } @@ -11240,7 +11261,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst93", 10) == 0) { { -return dev_storage + 135; +return dev_storage + 136; } } @@ -11255,7 +11276,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst83", 10) == 0) { { -return dev_storage + 125; +return dev_storage + 126; } } @@ -11270,7 +11291,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst73", 10) == 0) { { -return dev_storage + 115; +return dev_storage + 116; } } @@ -11285,7 +11306,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst63", 10) == 0) { { -return dev_storage + 105; +return dev_storage + 106; } } @@ -11300,7 +11321,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst53", 10) == 0) { { -return dev_storage + 95; +return dev_storage + 96; } } @@ -11315,7 +11336,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst43", 10) == 0) { { -return dev_storage + 85; +return dev_storage + 86; } } @@ -11330,7 +11351,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst33", 10) == 0) { { -return dev_storage + 75; +return dev_storage + 76; } } @@ -11345,7 +11366,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst23", 10) == 0) { { -return dev_storage + 65; +return dev_storage + 66; } } @@ -11363,7 +11384,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt13", 10) == 0) { { -return dev_storage + 514; +return dev_storage + 515; } } @@ -11378,7 +11399,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst13", 10) == 0) { { -return dev_storage + 55; +return dev_storage + 56; } } @@ -11405,7 +11426,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds13", 10) == 0) { { -return dev_storage + 499; +return dev_storage + 500; } } @@ -11420,7 +11441,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr13", 10) == 0) { { -return dev_storage + 484; +return dev_storage + 485; } } @@ -11435,7 +11456,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq13", 10) == 0) { { -return dev_storage + 469; +return dev_storage + 470; } } @@ -11450,7 +11471,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp13", 10) == 0) { { -return dev_storage + 454; +return dev_storage + 455; } } @@ -11465,7 +11486,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo13", 10) == 0) { { -return dev_storage + 439; +return dev_storage + 440; } } @@ -11480,7 +11501,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn13", 10) == 0) { { -return dev_storage + 424; +return dev_storage + 425; } } @@ -11498,7 +11519,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm13", 10) == 0) { { -return dev_storage + 409; +return dev_storage + 410; } } @@ -11513,7 +11534,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com13", 10) == 0) { { -return dev_storage + 13; +return dev_storage + 14; } } @@ -11534,7 +11555,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl13", 10) == 0) { { -return dev_storage + 394; +return dev_storage + 395; } } @@ -11549,7 +11570,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk13", 10) == 0) { { -return dev_storage + 379; +return dev_storage + 380; } } @@ -11564,7 +11585,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj13", 10) == 0) { { -return dev_storage + 364; +return dev_storage + 365; } } @@ -11579,7 +11600,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi13", 10) == 0) { { -return dev_storage + 349; +return dev_storage + 350; } } @@ -11594,7 +11615,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh13", 10) == 0) { { -return dev_storage + 334; +return dev_storage + 335; } } @@ -11609,7 +11630,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg13", 10) == 0) { { -return dev_storage + 319; +return dev_storage + 320; } } @@ -11624,7 +11645,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf13", 10) == 0) { { -return dev_storage + 304; +return dev_storage + 305; } } @@ -11639,7 +11660,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde13", 10) == 0) { { -return dev_storage + 289; +return dev_storage + 290; } } @@ -11657,7 +11678,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd13", 10) == 0) { { -return dev_storage + 274; +return dev_storage + 275; } } @@ -11672,7 +11693,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd13", 10) == 0) { { -return dev_storage + 188; +return dev_storage + 189; } } @@ -11693,7 +11714,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc13", 10) == 0) { { -return dev_storage + 259; +return dev_storage + 260; } } @@ -11708,7 +11729,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb13", 10) == 0) { { -return dev_storage + 244; +return dev_storage + 245; } } @@ -11723,7 +11744,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda13", 10) == 0) { { -return dev_storage + 229; +return dev_storage + 230; } } @@ -11741,7 +11762,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st123", 10) == 0) { { -return dev_storage + 746; +return dev_storage + 747; } } @@ -11756,7 +11777,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st113", 10) == 0) { { -return dev_storage + 736; +return dev_storage + 737; } } @@ -11771,7 +11792,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st103", 10) == 0) { { -return dev_storage + 726; +return dev_storage + 727; } } @@ -11801,7 +11822,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz12", 10) == 0) { { -return dev_storage + 603; +return dev_storage + 604; } } @@ -11819,7 +11840,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS2", 10) == 0) { { -return dev_storage + 818; +return dev_storage + 819; } } @@ -11834,7 +11855,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty62", 10) == 0) { { -return dev_storage + 814; +return dev_storage + 815; } } @@ -11849,7 +11870,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty52", 10) == 0) { { -return dev_storage + 804; +return dev_storage + 805; } } @@ -11864,7 +11885,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty42", 10) == 0) { { -return dev_storage + 794; +return dev_storage + 795; } } @@ -11879,7 +11900,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty32", 10) == 0) { { -return dev_storage + 784; +return dev_storage + 785; } } @@ -11894,7 +11915,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty22", 10) == 0) { { -return dev_storage + 774; +return dev_storage + 775; } } @@ -11912,7 +11933,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty12", 10) == 0) { { -return dev_storage + 764; +return dev_storage + 765; } } @@ -11927,7 +11948,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy12", 10) == 0) { { -return dev_storage + 588; +return dev_storage + 589; } } @@ -11954,7 +11975,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx12", 10) == 0) { { -return dev_storage + 573; +return dev_storage + 574; } } @@ -11969,7 +11990,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw12", 10) == 0) { { -return dev_storage + 558; +return dev_storage + 559; } } @@ -11984,7 +12005,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv12", 10) == 0) { { -return dev_storage + 543; +return dev_storage + 544; } } @@ -11999,7 +12020,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu12", 10) == 0) { { -return dev_storage + 528; +return dev_storage + 529; } } @@ -12017,7 +12038,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst92", 10) == 0) { { -return dev_storage + 134; +return dev_storage + 135; } } @@ -12032,7 +12053,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst82", 10) == 0) { { -return dev_storage + 124; +return dev_storage + 125; } } @@ -12047,7 +12068,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst72", 10) == 0) { { -return dev_storage + 114; +return dev_storage + 115; } } @@ -12062,7 +12083,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst62", 10) == 0) { { -return dev_storage + 104; +return dev_storage + 105; } } @@ -12077,7 +12098,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst52", 10) == 0) { { -return dev_storage + 94; +return dev_storage + 95; } } @@ -12092,7 +12113,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst42", 10) == 0) { { -return dev_storage + 84; +return dev_storage + 85; } } @@ -12107,7 +12128,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst32", 10) == 0) { { -return dev_storage + 74; +return dev_storage + 75; } } @@ -12122,7 +12143,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst22", 10) == 0) { { -return dev_storage + 64; +return dev_storage + 65; } } @@ -12140,7 +12161,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt12", 10) == 0) { { -return dev_storage + 513; +return dev_storage + 514; } } @@ -12155,7 +12176,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst12", 10) == 0) { { -return dev_storage + 54; +return dev_storage + 55; } } @@ -12182,7 +12203,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds12", 10) == 0) { { -return dev_storage + 498; +return dev_storage + 499; } } @@ -12197,7 +12218,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr12", 10) == 0) { { -return dev_storage + 483; +return dev_storage + 484; } } @@ -12212,7 +12233,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq12", 10) == 0) { { -return dev_storage + 468; +return dev_storage + 469; } } @@ -12227,7 +12248,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp12", 10) == 0) { { -return dev_storage + 453; +return dev_storage + 454; } } @@ -12242,7 +12263,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo12", 10) == 0) { { -return dev_storage + 438; +return dev_storage + 439; } } @@ -12257,7 +12278,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn12", 10) == 0) { { -return dev_storage + 423; +return dev_storage + 424; } } @@ -12275,7 +12296,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm12", 10) == 0) { { -return dev_storage + 408; +return dev_storage + 409; } } @@ -12290,7 +12311,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com12", 10) == 0) { { -return dev_storage + 12; +return dev_storage + 13; } } @@ -12311,7 +12332,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl12", 10) == 0) { { -return dev_storage + 393; +return dev_storage + 394; } } @@ -12326,7 +12347,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk12", 10) == 0) { { -return dev_storage + 378; +return dev_storage + 379; } } @@ -12341,7 +12362,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj12", 10) == 0) { { -return dev_storage + 363; +return dev_storage + 364; } } @@ -12356,7 +12377,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi12", 10) == 0) { { -return dev_storage + 348; +return dev_storage + 349; } } @@ -12371,7 +12392,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh12", 10) == 0) { { -return dev_storage + 333; +return dev_storage + 334; } } @@ -12386,7 +12407,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg12", 10) == 0) { { -return dev_storage + 318; +return dev_storage + 319; } } @@ -12401,7 +12422,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf12", 10) == 0) { { -return dev_storage + 303; +return dev_storage + 304; } } @@ -12416,7 +12437,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde12", 10) == 0) { { -return dev_storage + 288; +return dev_storage + 289; } } @@ -12434,7 +12455,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd12", 10) == 0) { { -return dev_storage + 273; +return dev_storage + 274; } } @@ -12449,7 +12470,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd12", 10) == 0) { { -return dev_storage + 187; +return dev_storage + 188; } } @@ -12470,7 +12491,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc12", 10) == 0) { { -return dev_storage + 258; +return dev_storage + 259; } } @@ -12485,7 +12506,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb12", 10) == 0) { { -return dev_storage + 243; +return dev_storage + 244; } } @@ -12500,7 +12521,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda12", 10) == 0) { { -return dev_storage + 228; +return dev_storage + 229; } } @@ -12518,7 +12539,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st122", 10) == 0) { { -return dev_storage + 745; +return dev_storage + 746; } } @@ -12533,7 +12554,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st112", 10) == 0) { { -return dev_storage + 735; +return dev_storage + 736; } } @@ -12548,7 +12569,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st102", 10) == 0) { { -return dev_storage + 725; +return dev_storage + 726; } } @@ -12578,7 +12599,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz11", 10) == 0) { { -return dev_storage + 602; +return dev_storage + 603; } } @@ -12596,7 +12617,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS1", 10) == 0) { { -return dev_storage + 817; +return dev_storage + 818; } } @@ -12611,7 +12632,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty61", 10) == 0) { { -return dev_storage + 813; +return dev_storage + 814; } } @@ -12626,7 +12647,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty51", 10) == 0) { { -return dev_storage + 803; +return dev_storage + 804; } } @@ -12641,7 +12662,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty41", 10) == 0) { { -return dev_storage + 793; +return dev_storage + 794; } } @@ -12656,7 +12677,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty31", 10) == 0) { { -return dev_storage + 783; +return dev_storage + 784; } } @@ -12671,7 +12692,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty21", 10) == 0) { { -return dev_storage + 773; +return dev_storage + 774; } } @@ -12689,7 +12710,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty11", 10) == 0) { { -return dev_storage + 763; +return dev_storage + 764; } } @@ -12704,7 +12725,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy11", 10) == 0) { { -return dev_storage + 587; +return dev_storage + 588; } } @@ -12731,7 +12752,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx11", 10) == 0) { { -return dev_storage + 572; +return dev_storage + 573; } } @@ -12746,7 +12767,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw11", 10) == 0) { { -return dev_storage + 557; +return dev_storage + 558; } } @@ -12761,7 +12782,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv11", 10) == 0) { { -return dev_storage + 542; +return dev_storage + 543; } } @@ -12776,7 +12797,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu11", 10) == 0) { { -return dev_storage + 527; +return dev_storage + 528; } } @@ -12794,7 +12815,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst91", 10) == 0) { { -return dev_storage + 133; +return dev_storage + 134; } } @@ -12809,7 +12830,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst81", 10) == 0) { { -return dev_storage + 123; +return dev_storage + 124; } } @@ -12824,7 +12845,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst71", 10) == 0) { { -return dev_storage + 113; +return dev_storage + 114; } } @@ -12839,7 +12860,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst61", 10) == 0) { { -return dev_storage + 103; +return dev_storage + 104; } } @@ -12854,7 +12875,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst51", 10) == 0) { { -return dev_storage + 93; +return dev_storage + 94; } } @@ -12869,7 +12890,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst41", 10) == 0) { { -return dev_storage + 83; +return dev_storage + 84; } } @@ -12884,7 +12905,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst31", 10) == 0) { { -return dev_storage + 73; +return dev_storage + 74; } } @@ -12899,7 +12920,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst21", 10) == 0) { { -return dev_storage + 63; +return dev_storage + 64; } } @@ -12917,7 +12938,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt11", 10) == 0) { { -return dev_storage + 512; +return dev_storage + 513; } } @@ -12932,7 +12953,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst11", 10) == 0) { { -return dev_storage + 53; +return dev_storage + 54; } } @@ -12959,7 +12980,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds11", 10) == 0) { { -return dev_storage + 497; +return dev_storage + 498; } } @@ -12974,7 +12995,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr11", 10) == 0) { { -return dev_storage + 482; +return dev_storage + 483; } } @@ -12989,7 +13010,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq11", 10) == 0) { { -return dev_storage + 467; +return dev_storage + 468; } } @@ -13004,7 +13025,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp11", 10) == 0) { { -return dev_storage + 452; +return dev_storage + 453; } } @@ -13019,7 +13040,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo11", 10) == 0) { { -return dev_storage + 437; +return dev_storage + 438; } } @@ -13034,7 +13055,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn11", 10) == 0) { { -return dev_storage + 422; +return dev_storage + 423; } } @@ -13052,7 +13073,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm11", 10) == 0) { { -return dev_storage + 407; +return dev_storage + 408; } } @@ -13067,7 +13088,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com11", 10) == 0) { { -return dev_storage + 11; +return dev_storage + 12; } } @@ -13088,7 +13109,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl11", 10) == 0) { { -return dev_storage + 392; +return dev_storage + 393; } } @@ -13103,7 +13124,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk11", 10) == 0) { { -return dev_storage + 377; +return dev_storage + 378; } } @@ -13118,7 +13139,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj11", 10) == 0) { { -return dev_storage + 362; +return dev_storage + 363; } } @@ -13133,7 +13154,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi11", 10) == 0) { { -return dev_storage + 347; +return dev_storage + 348; } } @@ -13148,7 +13169,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh11", 10) == 0) { { -return dev_storage + 332; +return dev_storage + 333; } } @@ -13163,7 +13184,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg11", 10) == 0) { { -return dev_storage + 317; +return dev_storage + 318; } } @@ -13178,7 +13199,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf11", 10) == 0) { { -return dev_storage + 302; +return dev_storage + 303; } } @@ -13193,7 +13214,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde11", 10) == 0) { { -return dev_storage + 287; +return dev_storage + 288; } } @@ -13211,7 +13232,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd11", 10) == 0) { { -return dev_storage + 272; +return dev_storage + 273; } } @@ -13226,7 +13247,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd11", 10) == 0) { { -return dev_storage + 186; +return dev_storage + 187; } } @@ -13247,7 +13268,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc11", 10) == 0) { { -return dev_storage + 257; +return dev_storage + 258; } } @@ -13262,7 +13283,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb11", 10) == 0) { { -return dev_storage + 242; +return dev_storage + 243; } } @@ -13277,7 +13298,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda11", 10) == 0) { { -return dev_storage + 227; +return dev_storage + 228; } } @@ -13295,7 +13316,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st121", 10) == 0) { { -return dev_storage + 744; +return dev_storage + 745; } } @@ -13310,7 +13331,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st111", 10) == 0) { { -return dev_storage + 734; +return dev_storage + 735; } } @@ -13325,7 +13346,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st101", 10) == 0) { { -return dev_storage + 724; +return dev_storage + 725; } } @@ -13355,7 +13376,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdz10", 10) == 0) { { -return dev_storage + 601; +return dev_storage + 602; } } @@ -13373,7 +13394,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS0", 10) == 0) { { -return dev_storage + 816; +return dev_storage + 817; } } @@ -13388,7 +13409,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty60", 10) == 0) { { -return dev_storage + 812; +return dev_storage + 813; } } @@ -13403,7 +13424,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty50", 10) == 0) { { -return dev_storage + 802; +return dev_storage + 803; } } @@ -13418,7 +13439,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty40", 10) == 0) { { -return dev_storage + 792; +return dev_storage + 793; } } @@ -13433,7 +13454,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty30", 10) == 0) { { -return dev_storage + 782; +return dev_storage + 783; } } @@ -13448,7 +13469,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty20", 10) == 0) { { -return dev_storage + 772; +return dev_storage + 773; } } @@ -13466,7 +13487,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/tty10", 10) == 0) { { -return dev_storage + 762; +return dev_storage + 763; } } @@ -13481,7 +13502,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdy10", 10) == 0) { { -return dev_storage + 586; +return dev_storage + 587; } } @@ -13508,7 +13529,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdx10", 10) == 0) { { -return dev_storage + 571; +return dev_storage + 572; } } @@ -13523,7 +13544,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdw10", 10) == 0) { { -return dev_storage + 556; +return dev_storage + 557; } } @@ -13538,7 +13559,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdv10", 10) == 0) { { -return dev_storage + 541; +return dev_storage + 542; } } @@ -13553,7 +13574,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdu10", 10) == 0) { { -return dev_storage + 526; +return dev_storage + 527; } } @@ -13571,7 +13592,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst90", 10) == 0) { { -return dev_storage + 132; +return dev_storage + 133; } } @@ -13586,7 +13607,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst80", 10) == 0) { { -return dev_storage + 122; +return dev_storage + 123; } } @@ -13601,7 +13622,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst70", 10) == 0) { { -return dev_storage + 112; +return dev_storage + 113; } } @@ -13616,7 +13637,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst60", 10) == 0) { { -return dev_storage + 102; +return dev_storage + 103; } } @@ -13631,7 +13652,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst50", 10) == 0) { { -return dev_storage + 92; +return dev_storage + 93; } } @@ -13646,7 +13667,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst40", 10) == 0) { { -return dev_storage + 82; +return dev_storage + 83; } } @@ -13661,7 +13682,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst30", 10) == 0) { { -return dev_storage + 72; +return dev_storage + 73; } } @@ -13676,7 +13697,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst20", 10) == 0) { { -return dev_storage + 62; +return dev_storage + 63; } } @@ -13694,7 +13715,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdt10", 10) == 0) { { -return dev_storage + 511; +return dev_storage + 512; } } @@ -13709,7 +13730,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst10", 10) == 0) { { -return dev_storage + 52; +return dev_storage + 53; } } @@ -13736,7 +13757,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sds10", 10) == 0) { { -return dev_storage + 496; +return dev_storage + 497; } } @@ -13751,7 +13772,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdr10", 10) == 0) { { -return dev_storage + 481; +return dev_storage + 482; } } @@ -13766,7 +13787,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdq10", 10) == 0) { { -return dev_storage + 466; +return dev_storage + 467; } } @@ -13781,7 +13802,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdp10", 10) == 0) { { -return dev_storage + 451; +return dev_storage + 452; } } @@ -13796,7 +13817,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdo10", 10) == 0) { { -return dev_storage + 436; +return dev_storage + 437; } } @@ -13811,7 +13832,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdn10", 10) == 0) { { -return dev_storage + 421; +return dev_storage + 422; } } @@ -13829,7 +13850,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdm10", 10) == 0) { { -return dev_storage + 406; +return dev_storage + 407; } } @@ -13844,7 +13865,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/com10", 10) == 0) { { -return dev_storage + 10; +return dev_storage + 11; } } @@ -13865,7 +13886,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdl10", 10) == 0) { { -return dev_storage + 391; +return dev_storage + 392; } } @@ -13880,7 +13901,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdk10", 10) == 0) { { -return dev_storage + 376; +return dev_storage + 377; } } @@ -13895,7 +13916,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdj10", 10) == 0) { { -return dev_storage + 361; +return dev_storage + 362; } } @@ -13910,7 +13931,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdi10", 10) == 0) { { -return dev_storage + 346; +return dev_storage + 347; } } @@ -13925,7 +13946,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdh10", 10) == 0) { { -return dev_storage + 331; +return dev_storage + 332; } } @@ -13940,7 +13961,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdg10", 10) == 0) { { -return dev_storage + 316; +return dev_storage + 317; } } @@ -13955,7 +13976,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdf10", 10) == 0) { { -return dev_storage + 301; +return dev_storage + 302; } } @@ -13970,7 +13991,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sde10", 10) == 0) { { -return dev_storage + 286; +return dev_storage + 287; } } @@ -13988,7 +14009,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdd10", 10) == 0) { { -return dev_storage + 271; +return dev_storage + 272; } } @@ -14003,7 +14024,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/scd10", 10) == 0) { { -return dev_storage + 185; +return dev_storage + 186; } } @@ -14024,7 +14045,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdc10", 10) == 0) { { -return dev_storage + 256; +return dev_storage + 257; } } @@ -14039,7 +14060,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sdb10", 10) == 0) { { -return dev_storage + 241; +return dev_storage + 242; } } @@ -14054,7 +14075,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/sda10", 10) == 0) { { -return dev_storage + 226; +return dev_storage + 227; } } @@ -14072,7 +14093,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st120", 10) == 0) { { -return dev_storage + 743; +return dev_storage + 744; } } @@ -14087,7 +14108,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st110", 10) == 0) { { -return dev_storage + 733; +return dev_storage + 734; } } @@ -14102,7 +14123,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/st100", 10) == 0) { { -return dev_storage + 723; +return dev_storage + 724; } } @@ -14138,7 +14159,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/conout", 11) == 0) { { -return dev_storage + 18; +return dev_storage + 19; } } @@ -14153,7 +14174,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/random", 11) == 0) { { -return dev_storage + 174; +return dev_storage + 175; } } @@ -14171,7 +14192,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst127", 11) == 0) { { -return dev_storage + 169; +return dev_storage + 170; } } @@ -14186,7 +14207,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst126", 11) == 0) { { -return dev_storage + 168; +return dev_storage + 169; } } @@ -14201,7 +14222,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst125", 11) == 0) { { -return dev_storage + 167; +return dev_storage + 168; } } @@ -14216,7 +14237,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst124", 11) == 0) { { -return dev_storage + 166; +return dev_storage + 167; } } @@ -14231,7 +14252,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst123", 11) == 0) { { -return dev_storage + 165; +return dev_storage + 166; } } @@ -14246,7 +14267,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst122", 11) == 0) { { -return dev_storage + 164; +return dev_storage + 165; } } @@ -14261,7 +14282,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst121", 11) == 0) { { -return dev_storage + 163; +return dev_storage + 164; } } @@ -14276,7 +14297,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst120", 11) == 0) { { -return dev_storage + 162; +return dev_storage + 163; } } @@ -14300,7 +14321,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst119", 11) == 0) { { -return dev_storage + 161; +return dev_storage + 162; } } @@ -14315,7 +14336,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst118", 11) == 0) { { -return dev_storage + 160; +return dev_storage + 161; } } @@ -14330,7 +14351,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst117", 11) == 0) { { -return dev_storage + 159; +return dev_storage + 160; } } @@ -14345,7 +14366,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst116", 11) == 0) { { -return dev_storage + 158; +return dev_storage + 159; } } @@ -14363,7 +14384,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS15", 11) == 0) { { -return dev_storage + 831; +return dev_storage + 832; } } @@ -14378,7 +14399,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst115", 11) == 0) { { -return dev_storage + 157; +return dev_storage + 158; } } @@ -14402,7 +14423,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS14", 11) == 0) { { -return dev_storage + 830; +return dev_storage + 831; } } @@ -14417,7 +14438,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst114", 11) == 0) { { -return dev_storage + 156; +return dev_storage + 157; } } @@ -14441,7 +14462,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS13", 11) == 0) { { -return dev_storage + 829; +return dev_storage + 830; } } @@ -14456,7 +14477,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst113", 11) == 0) { { -return dev_storage + 155; +return dev_storage + 156; } } @@ -14480,7 +14501,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS12", 11) == 0) { { -return dev_storage + 828; +return dev_storage + 829; } } @@ -14495,7 +14516,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst112", 11) == 0) { { -return dev_storage + 154; +return dev_storage + 155; } } @@ -14519,7 +14540,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS11", 11) == 0) { { -return dev_storage + 827; +return dev_storage + 828; } } @@ -14534,7 +14555,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst111", 11) == 0) { { -return dev_storage + 153; +return dev_storage + 154; } } @@ -14558,7 +14579,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/ttyS10", 11) == 0) { { -return dev_storage + 826; +return dev_storage + 827; } } @@ -14573,7 +14594,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst110", 11) == 0) { { -return dev_storage + 152; +return dev_storage + 153; } } @@ -14603,7 +14624,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst109", 11) == 0) { { -return dev_storage + 151; +return dev_storage + 152; } } @@ -14618,7 +14639,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst108", 11) == 0) { { -return dev_storage + 150; +return dev_storage + 151; } } @@ -14633,7 +14654,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst107", 11) == 0) { { -return dev_storage + 149; +return dev_storage + 150; } } @@ -14648,7 +14669,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst106", 11) == 0) { { -return dev_storage + 148; +return dev_storage + 149; } } @@ -14663,7 +14684,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst105", 11) == 0) { { -return dev_storage + 147; +return dev_storage + 148; } } @@ -14678,7 +14699,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst104", 11) == 0) { { -return dev_storage + 146; +return dev_storage + 147; } } @@ -14693,7 +14714,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst103", 11) == 0) { { -return dev_storage + 145; +return dev_storage + 146; } } @@ -14708,7 +14729,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst102", 11) == 0) { { -return dev_storage + 144; +return dev_storage + 145; } } @@ -14723,7 +14744,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst101", 11) == 0) { { -return dev_storage + 143; +return dev_storage + 144; } } @@ -14738,7 +14759,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/nst100", 11) == 0) { { -return dev_storage + 142; +return dev_storage + 143; } } @@ -14768,7 +14789,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/windows", 12) == 0) { { -return dev_storage + 834; +return dev_storage + 835; } } @@ -14783,7 +14804,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/urandom", 12) == 0) { { -return dev_storage + 833; +return dev_storage + 834; } } @@ -14798,7 +14819,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/console", 12) == 0) { { -return dev_storage + 19; +return dev_storage + 20; } } @@ -14819,7 +14840,7 @@ return NULL; if (strncmp (KR_keyword, "/dev/clipboard", 14) == 0) { { -return dev_storage + 0; +return dev_storage + 1; } } diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h index b1fac1878..b21f8f6a0 100644 --- a/winsup/cygwin/devices.h +++ b/winsup/cygwin/devices.h @@ -50,6 +50,7 @@ enum fh_devices FH_FS = FHDEV (0, 247), /* filesystem based device */ FH_NETDRIVE= FHDEV (0, 246), + FH_DEV = FHDEV (0, 245), DEV_FLOPPY_MAJOR = 2, FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0), diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in index c2750f95c..326e5526e 100644 --- a/winsup/cygwin/devices.in +++ b/winsup/cygwin/devices.in @@ -24,6 +24,11 @@ const device dev_proc_storage = const device dev_netdrive_storage = {"", {FH_NETDRIVE}, ""}; +#if 0 +const device dev_dev_storage = + {"/dev", {FH_DEV}, "/dev"}; +#endif + const device dev_registry_storage = {"", {FH_REGISTRY}, ""}; @@ -82,6 +87,7 @@ const device dev_bad_storage = "/dev/sd%{a-z}s", BRACK(FH_SD{uc $1}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0" "/dev/sd%{a-z}s%(1-15)d", BRACK(FH_SD{uc $1} | {$2}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}" "/dev/kmsg", BRACK(FH_KMSG), "\\\\.\\mailslot\\cygwin\\dev\\kmsg" +"/dev", BRACK(FH_DEV), "/dev" %other {return NULL;} %% #undef BRACK diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 74b25f2f6..f3c13e2ce 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -342,7 +342,7 @@ fhandler_proc::fill_filebuf () uname (&uts_name); bufalloc = strlen (uts_name.sysname) + 1 + strlen (uts_name.release) + 1 + strlen (uts_name.version) + 2; - filebuf = (char *) realloc (filebuf, bufalloc); + filebuf = (char *) crealloc (filebuf, bufalloc); filesize = __small_sprintf (filebuf, "%s %s %s\n", uts_name.sysname, uts_name.release, uts_name.version); } @@ -350,13 +350,13 @@ fhandler_proc::fill_filebuf () } case PROC_UPTIME: { - filebuf = (char *) realloc (filebuf, bufalloc = 80); + filebuf = (char *) crealloc (filebuf, bufalloc = 80); filesize = format_proc_uptime (filebuf, bufalloc); break; } case PROC_STAT: { - filebuf = (char *) realloc (filebuf, bufalloc = 16384); + filebuf = (char *) crealloc (filebuf, bufalloc = 16384); filesize = format_proc_stat (filebuf, bufalloc); break; } @@ -367,32 +367,32 @@ fhandler_proc::fill_filebuf () * Windows 95/98/me does have the KERNEL/CPUUsage performance counter * which is similar. */ - filebuf = (char *) realloc (filebuf, bufalloc = 16); + filebuf = (char *) crealloc (filebuf, bufalloc = 16); filesize = __small_sprintf (filebuf, "%u.%02u %u.%02u %u.%02u\n", 0, 0, 0, 0, 0, 0); break; } case PROC_MEMINFO: { - filebuf = (char *) realloc (filebuf, bufalloc = 2048); + filebuf = (char *) crealloc (filebuf, bufalloc = 2048); filesize = format_proc_meminfo (filebuf, bufalloc); break; } case PROC_CPUINFO: { - filebuf = (char *) realloc (filebuf, bufalloc = 16384); + filebuf = (char *) crealloc (filebuf, bufalloc = 16384); filesize = format_proc_cpuinfo (filebuf, bufalloc); break; } case PROC_PARTITIONS: { - filebuf = (char *) realloc (filebuf, bufalloc = 4096); + filebuf = (char *) crealloc (filebuf, bufalloc = 4096); filesize = format_proc_partitions (filebuf, bufalloc); break; } case PROC_SELF: { - filebuf = (char *) realloc (filebuf, bufalloc = 32); + filebuf = (char *) crealloc (filebuf, bufalloc = 32); filesize = __small_sprintf (filebuf, "%d", getpid ()); } } diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 1585c2fea..09af49708 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -351,13 +351,13 @@ fhandler_process::fill_filebuf () if (!fdp || *++fdp == 'f') /* The "fd" directory itself. */ { if (filebuf) - free (filebuf); + cfree (filebuf); filebuf = p->fds (fs); } else { if (filebuf) - free (filebuf); + cfree (filebuf); int fd = atoi (fdp); if (fd < 0 || (fd == 0 && !isdigit (*fdp))) { @@ -381,7 +381,7 @@ fhandler_process::fill_filebuf () case PROCESS_CTTY: case PROCESS_PPID: { - filebuf = (char *) realloc (filebuf, bufalloc = 40); + filebuf = (char *) crealloc (filebuf, bufalloc = 40); int num; switch (fileid) { @@ -416,7 +416,10 @@ fhandler_process::fill_filebuf () case PROCESS_CMDLINE: { if (filebuf) - free (filebuf); + { + cfree (filebuf); + filebuf = NULL; + } size_t fs; switch (fileid) { @@ -433,7 +436,7 @@ fhandler_process::fill_filebuf () filesize = fs; if (!filebuf || !*filebuf) { - filebuf = strdup (""); + filebuf = cstrdup (""); filesize = strlen (filebuf) + 1; } break; @@ -441,7 +444,7 @@ fhandler_process::fill_filebuf () case PROCESS_EXENAME: case PROCESS_EXE: { - filebuf = (char *) realloc (filebuf, bufalloc = CYG_MAX_PATH); + filebuf = (char *) crealloc (filebuf, bufalloc = CYG_MAX_PATH); if (p->process_state & PID_EXITED) strcpy (filebuf, ""); else @@ -460,7 +463,7 @@ fhandler_process::fill_filebuf () } case PROCESS_WINPID: { - filebuf = (char *) realloc (filebuf, bufalloc = 40); + filebuf = (char *) crealloc (filebuf, bufalloc = 40); __small_sprintf (filebuf, "%d\n", p->dwProcessId); filesize = strlen (filebuf); break; @@ -468,7 +471,7 @@ fhandler_process::fill_filebuf () case PROCESS_WINEXENAME: { int len = strlen (p->progname); - filebuf = (char *) realloc (filebuf, bufalloc = (len + 2)); + filebuf = (char *) crealloc (filebuf, bufalloc = (len + 2)); strcpy (filebuf, p->progname); filebuf[len] = '\n'; filesize = len + 1; @@ -476,25 +479,25 @@ fhandler_process::fill_filebuf () } case PROCESS_STATUS: { - filebuf = (char *) realloc (filebuf, bufalloc = 2048); + filebuf = (char *) crealloc (filebuf, bufalloc = 2048); filesize = format_process_status (*p, filebuf, bufalloc); break; } case PROCESS_STAT: { - filebuf = (char *) realloc (filebuf, bufalloc = 2048); + filebuf = (char *) crealloc (filebuf, bufalloc = 2048); filesize = format_process_stat (*p, filebuf, bufalloc); break; } case PROCESS_STATM: { - filebuf = (char *) realloc (filebuf, bufalloc = 2048); + filebuf = (char *) crealloc (filebuf, bufalloc = 2048); filesize = format_process_statm (*p, filebuf, bufalloc); break; } case PROCESS_MAPS: { - filebuf = (char *) realloc (filebuf, bufalloc = 2048); + filebuf = (char *) crealloc (filebuf, bufalloc = 2048); filesize = format_process_maps (*p, filebuf, bufalloc); break; } @@ -560,7 +563,7 @@ format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize) st.st_ino = 0; } if (len + strlen (posix_modname) + 62 > maxsize - 1) - destbuf = (char *) realloc (destbuf, maxsize += 2048); + destbuf = (char *) crealloc (destbuf, maxsize += 2048); if (workingset) for (unsigned i = 1; i <= wset_size; ++i) { @@ -914,7 +917,7 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, VM_COUNTERS vmc; MEMORY_WORKING_SET_LIST *mwsl; ULONG n = 0x1000, length; - PULONG p = new ULONG[n]; + PULONG p = (PULONG) malloc (sizeof (ULONG) * n); unsigned page_size = getpagesize (); hProcess = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, dwProcessId); @@ -930,8 +933,9 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, (PVOID) p, n * sizeof *p, &length)), (ret == STATUS_SUCCESS || ret == STATUS_INFO_LENGTH_MISMATCH) && - length >= n * sizeof *p) - delete [] p, p = new ULONG[n *= 2]; + length >= (n * sizeof (*p))) + p = (PULONG) realloc (p, n *= (2 * sizeof (ULONG))); + if (ret != STATUS_SUCCESS) { debug_printf ("NtQueryVirtualMemory: ret %d, Dos(ret) %d", @@ -945,17 +949,15 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, ++*vmrss; unsigned flags = mwsl->WorkingSetList[i] & 0x0FFF; if (flags & (WSLE_PAGE_EXECUTE | WSLE_PAGE_SHAREABLE) == (WSLE_PAGE_EXECUTE | WSLE_PAGE_SHAREABLE)) - ++*vmlib; + ++*vmlib; else if (flags & WSLE_PAGE_SHAREABLE) - ++*vmshare; + ++*vmshare; else if (flags & WSLE_PAGE_EXECUTE) - ++*vmtext; + ++*vmtext; else - ++*vmdata; + ++*vmdata; } - ret = NtQueryInformationProcess (hProcess, - ProcessVmCounters, - (PVOID) &vmc, + ret = NtQueryInformationProcess (hProcess, ProcessVmCounters, (PVOID) &vmc, sizeof vmc, NULL); if (ret != STATUS_SUCCESS) { @@ -966,7 +968,7 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, } *vmsize = vmc.PagefileUsage / page_size; out: - delete [] p; + free (p); CloseHandle (hProcess); return res; } diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc index 885a35247..37bb63983 100644 --- a/winsup/cygwin/fhandler_registry.cc +++ b/winsup/cygwin/fhandler_registry.cc @@ -539,7 +539,10 @@ fhandler_registry::close () } } if (!hExeced && value_name) - cfree (value_name); + { + cfree (value_name); + value_name = NULL; + } return res; } @@ -562,7 +565,7 @@ fhandler_registry::fill_filebuf () goto value_not_found; } bufalloc = size; - filebuf = (char *) malloc (bufalloc); + filebuf = (char *) cmalloc (HEAP_BUF, bufalloc); error = RegQueryValueEx (handle, value_name, NULL, NULL, (BYTE *) filebuf, &size); @@ -579,7 +582,7 @@ fhandler_registry::fill_filebuf () do { bufalloc += 1000; - filebuf = (char *) realloc (filebuf, bufalloc); + filebuf = (char *) crealloc (filebuf, bufalloc); size = bufalloc; error = RegQueryValueEx (handle, value_name, NULL, &type, (BYTE *) filebuf, &size); diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc index 9afc1d760..ab078d616 100644 --- a/winsup/cygwin/fhandler_virtual.cc +++ b/winsup/cygwin/fhandler_virtual.cc @@ -33,14 +33,15 @@ fhandler_virtual::fhandler_virtual (): fhandler_virtual::~fhandler_virtual () { if (filebuf) - free (filebuf); - filebuf = NULL; + { + cfree (filebuf); + filebuf = NULL; + } } void fhandler_virtual::fixup_after_exec () { - close (); } DIR * @@ -154,7 +155,7 @@ fhandler_virtual::dup (fhandler_base * child) if (!ret) { fhandler_virtual *fhproc_child = (fhandler_virtual *) child; - fhproc_child->filebuf = (char *) malloc (filesize); + fhproc_child->filebuf = (char *) cmalloc (HEAP_BUF, filesize); fhproc_child->bufalloc = fhproc_child->filesize = filesize; fhproc_child->position = position; memcpy (fhproc_child->filebuf, filebuf, filesize); @@ -168,8 +169,7 @@ fhandler_virtual::close () { if (!hExeced) { - if (filebuf) - free (filebuf); + cfree (filebuf); filebuf = NULL; bufalloc = (size_t) -1; } diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 2a5ca4608..787251d72 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -634,11 +634,17 @@ path_conv::check (const char *src, unsigned opt, fileattr = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY; else { - dev.devn = FH_FS; fileattr = GetFileAttributes (this->path); + dev.devn = FH_FS; } goto out; } + else if (dev == FH_DEV) + { + fileattr = FILE_ATTRIBUTE_DIRECTORY; + dev.devn = FH_FS; + goto out; + } else if (isvirtual_dev (dev.devn)) { /* FIXME: Calling build_fhandler here is not the right way to handle this. */ diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index e253cac5d..babed0cde 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -727,9 +727,9 @@ _pinfo::commune_send (DWORD code, ...) res.s = NULL; else { - res.s = (char *) malloc (n); + res.s = (char *) cmalloc (HEAP_COMMUNE, n); char *p; - for (p = res.s; ReadFile (fromthem, p, n, &nr, NULL); p += nr) + for (p = res.s; n && ReadFile (fromthem, p, n, &nr, NULL); p += nr, n -= nr) continue; if ((unsigned) (p - res.s) != n) { @@ -817,9 +817,9 @@ _pinfo::fd (int fd, size_t &n) { cygheap_fdget cfd (fd); if (cfd < 0) - s = strdup (""); + s = cstrdup (""); else - s = cfd->get_proc_fd_name ((char *) malloc (CYG_MAX_PATH)); + s = cfd->get_proc_fd_name ((char *) cmalloc (HEAP_COMMUNE, CYG_MAX_PATH)); n = strlen (s) + 1; } return s; @@ -845,7 +845,7 @@ _pinfo::fds (size_t &n) while ((fd = cfd.next ()) >= 0) n += sizeof (int); cfd.rewind (); - s = (char *) malloc (n); + s = (char *) cmalloc (HEAP_COMMUNE, n); int *p = (int *) s; while ((fd = cfd.next ()) >= 0 && (char *) p - s < (int) n) *p++ = fd; @@ -868,9 +868,9 @@ _pinfo::root (size_t& n) else { if (cygheap->root.exists ()) - s = strdup (cygheap->root.posix_path ()); + s = cstrdup (cygheap->root.posix_path ()); else - s = strdup ("/"); + s = cstrdup ("/"); n = strlen (s) + 1; } return s; @@ -890,7 +890,7 @@ _pinfo::cwd (size_t& n) } else { - s = (char *) malloc (CYG_MAX_PATH); + s = (char *) cmalloc (HEAP_COMMUNE, CYG_MAX_PATH); cygheap->cwd.get (s, 1, 1, CYG_MAX_PATH); n = strlen (s) + 1; } @@ -915,7 +915,7 @@ _pinfo::cmdline (size_t& n) for (char **a = __argv; *a; a++) n += strlen (*a) + 1; char *p; - p = s = (char *) malloc (n); + p = s = (char *) cmalloc (HEAP_COMMUNE, n); for (char **a = __argv; *a; a++) { strcpy (p, *a);