From: Todd C. Miller Date: Thu, 10 Jun 2010 21:53:27 +0000 (-0400) Subject: A comment character may not be part of a command line argument X-Git-Tag: SUDO_1_7_3~84 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e57600c2f08f482a26a454d3d07546603a43d766;p=sudo A comment character may not be part of a command line argument unless it is quoted with a backslash. Fixes parsing of: testuser ALL=NOPASSWD: /usr/bin/wl #comment foo bar closes bz #441 --HG-- branch : 1.7 --- diff --git a/toke.c b/toke.c index 4875fb098..0d99df888 100644 --- a/toke.c +++ b/toke.c @@ -389,10 +389,10 @@ static yyconst int yy_ec[256] = static yyconst int yy_meta[63] = { 0, - 1, 2, 3, 4, 5, 6, 1, 4, 4, 1, - 1, 2, 1, 7, 8, 9, 9, 9, 9, 9, - 9, 9, 9, 10, 6, 4, 1, 9, 9, 9, - 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 3, 4, 5, 2, 1, 4, 4, 1, + 1, 2, 1, 6, 7, 8, 8, 8, 8, 8, + 8, 8, 8, 9, 10, 4, 1, 8, 8, 8, + 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 11, 12, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12 @@ -401,21 +401,21 @@ static yyconst int yy_meta[63] = static yyconst short int yy_base[620] = { 0, 0, 61, 62, 63, 69, 84, 128, 189, 250, 294, - 80, 101, 2349, 2303, 2345, 3488, 2316, 338, 381, 52, - 3488, 3488, 2272, 3488, 107, 391, 119, 137, 2292, 3488, - 3488, 443, 2271, 490, 2270, 2260, 2253, 541, 145, 55, + 80, 101, 2349, 2303, 2345, 3527, 2316, 338, 381, 52, + 3527, 3527, 2272, 3527, 107, 391, 119, 137, 2292, 3527, + 3527, 443, 2271, 490, 2270, 2260, 2253, 541, 145, 55, 167, 565, 2228, 2232, 2224, 2219, 2206, 2254, 193, 256, - 56, 0, 3488, 2249, 0, 3488, 264, 617, 77, 0, - 2199, 3488, 82, 3488, 99, 3488, 110, 2189, 126, 106, - 3488, 145, 2179, 306, 2185, 2182, 639, 2145, 2144, 2135, - 3488, 201, 209, 74, 2082, 347, 2079, 550, 276, 2078, + 56, 0, 3527, 2249, 3527, 0, 264, 617, 77, 0, + 2199, 3527, 82, 3527, 99, 3527, 110, 2189, 126, 106, + 3527, 145, 2179, 306, 2185, 2182, 639, 2145, 2144, 2135, + 3527, 201, 209, 74, 2082, 347, 2079, 550, 276, 2078, 587, 410, 669, 2098, 2104, 306, 358, 317, 2092, 179, - 706, 0, 2083, 240, 2075, 2071, 389, 3488, 76, 355, + 706, 0, 2083, 240, 2075, 2071, 389, 3527, 76, 355, 2039, 2041, 2033, 2021, 2000, 63, 115, 219, 29, 212, 98, 2056, 507, 361, 1986, 598, 154, 0, 2024, 256, - 3488, 3488, 636, 284, 0, 1982, 567, 3488, 3488, 1981, - 532, 1979, 1994, 271, 300, 288, 1975, 1905, 3488, 1944, + 3527, 3527, 636, 284, 0, 1982, 567, 3527, 3527, 1981, + 532, 1979, 1994, 271, 300, 288, 1975, 1905, 3527, 1944, 1916, 1873, 669, 603, 745, 777, 809, 841, 1902, 1876, 878, 268, 916, 953, 1869, 1854, 1854, 1849, 1841, 1831, 236, 1805, 1788, 1746, 1748, 1719, 317, 157, 1722, 307, @@ -426,7 +426,7 @@ static yyconst short int yy_base[620] = 1639, 1646, 373, 1629, 1616, 1601, 1614, 1586, 543, 400, 556, 233, 506, 1133, 1165, 1197, 1620, 1619, 827, 1619, 1602, 1601, 1590, 540, 858, 546, 895, 602, 1229, 0, - 935, 1240, 970, 731, 1278, 1002, 601, 3488, 1581, 1571, + 935, 1240, 970, 731, 1278, 1002, 601, 3527, 1581, 1571, 1577, 1577, 1537, 486, 1532, 1515, 1470, 387, 343, 380, 616, 1010, 423, 1317, 1349, 1044, 1470, 1469, 1451, 1450, 1379, 645, 1076, 1113, 1143, 652, 983, 1035, 1151, 1042, @@ -436,7 +436,7 @@ static yyconst short int yy_base[620] = 1505, 1536, 1567, 1430, 1382, 1381, 1215, 1599, 1257, 903, 1636, 1297, 1325, 1347, 1335, 1359, 1369, 841, 1024, 1067, 1124, 1396, 1308, 1675, 0, 1448, 1686, 1484, 1265, 1724, - 1515, 955, 3488, 1329, 1282, 956, 3488, 975, 3488, 807, + 1515, 955, 3527, 1329, 1282, 956, 3527, 975, 3527, 807, 1266, 1244, 591, 1074, 569, 917, 1523, 155, 1762, 1793, 1546, 1280, 1243, 1553, 768, 1576, 810, 1825, 0, 429, 1836, 1584, 1404, 1873, 1618, 1655, 1705, 1743, 1288, 1335, @@ -446,7 +446,7 @@ static yyconst short int yy_base[620] = 1198, 1964, 1350, 2112, 0, 762, 2123, 1972, 1992, 2160, 2000, 2024, 1126, 2034, 2058, 2068, 1369, 1609, 1934, 772, - 806, 2199, 0, 844, 1173, 3488, 1468, 3488, 1090, 2086, + 806, 2199, 0, 844, 1173, 3527, 1468, 3527, 1090, 2086, 1389, 142, 991, 1076, 1075, 2140, 1038, 2209, 2241, 2273, 2305, 2103, 2177, 1088, 2219, 2229, 2251, 1077, 1076, 1656, 1706, 2257, 1837, 2337, 0, 881, 2348, 2281, 2088, 2385, @@ -455,19 +455,19 @@ static yyconst short int yy_base[620] = 2468, 2496, 2506, 757, 716, 1893, 2001, 2526, 2035, 2550, 0, 1012, 2561, 2534, 2148, 2580, 647, 2599, 2608, 2477, - 634, 3488, 629, 3488, 1051, 2616, 1195, 2648, 2680, 2627, + 634, 3527, 629, 3527, 1051, 2616, 1195, 2648, 2680, 2627, 2633, 594, 2659, 2669, 2690, 573, 566, 2049, 557, 549, 2698, 0, 1045, 1545, 2712, 2744, 2776, 2720, 2728, 2752, - 509, 0, 455, 357, 2760, 1535, 2808, 2840, 2790, 3488, - 2796, 2820, 2185, 3488, 345, 3488, 2828, 2848, 2858, 25, - 2878, 2870, 3488, 2923, 2936, 2949, 2962, 2975, 2988, 3001, - 3014, 3027, 3040, 3045, 3058, 3071, 3073, 3086, 3099, 3112, - 3125, 3138, 3151, 3164, 3177, 3182, 3188, 3201, 3214, 3219, - 3225, 3230, 3235, 3240, 3246, 3251, 3256, 3261, 3267, 3274, - 3279, 3284, 3289, 3295, 3302, 3307, 3312, 3318, 3325, 3330, - - 3337, 3343, 3350, 3355, 3362, 3368, 3375, 3388, 3401, 3406, - 3413, 3419, 3432, 3437, 3444, 3449, 3456, 3461, 3474 + 509, 0, 455, 357, 2760, 1535, 2808, 2840, 2790, 3527, + 2796, 2820, 2185, 3527, 345, 3527, 2828, 2848, 2858, 25, + 2878, 2870, 3527, 2923, 2936, 2949, 2962, 2975, 2988, 3001, + 3014, 3027, 3040, 3046, 3059, 3072, 3074, 3087, 3100, 3113, + 3126, 3139, 3152, 3165, 3178, 3184, 3191, 3204, 3217, 3223, + 3230, 3236, 3242, 3248, 3255, 3261, 3267, 3273, 3280, 3288, + 3294, 3300, 3306, 3313, 3321, 3327, 3333, 3340, 3348, 3354, + + 3362, 3369, 3377, 3383, 3391, 3398, 3406, 3419, 3432, 3438, + 3446, 3453, 3466, 3472, 3480, 3486, 3494, 3500, 3513 } ; static yyconst short int yy_def[620] = @@ -477,7 +477,7 @@ static yyconst short int yy_def[620] = 553, 553, 562, 553, 563, 558, 26, 26, 564, 553, 553, 553, 32, 32, 34, 34, 34, 558, 26, 558, 553, 560, 32, 32, 34, 34, 34, 553, 553, 565, - 558, 566, 553, 566, 566, 553, 553, 560, 553, 567, + 558, 566, 553, 566, 553, 566, 553, 560, 553, 567, 568, 553, 568, 553, 568, 553, 569, 570, 570, 570, 553, 553, 558, 558, 553, 553, 559, 571, 559, 572, 553, 573, 553, 561, 574, 561, 562, 562, 563, 575, @@ -542,7 +542,7 @@ static yyconst short int yy_def[620] = 553, 553, 553, 553, 553, 553, 553, 553, 553 } ; -static yyconst short int yy_nxt[3551] = +static yyconst short int yy_nxt[3590] = { 0, 14, 15, 16, 17, 18, 19, 20, 21, 22, 14, 23, 24, 14, 14, 25, 26, 27, 28, 26, 26, @@ -552,10 +552,10 @@ static yyconst short int yy_nxt[3551] = 39, 39, 14, 14, 14, 14, 14, 14, 14, 40, 14, 14, 41, 48, 48, 81, 42, 49, 49, 74, 15, 53, 54, 74, 55, 85, 50, 50, 134, 108, - 56, 69, 16, 70, 71, 15, 53, 54, 180, 55, - 43, 44, 56, 55, 45, 56, 86, 553, 46, 74, + 55, 69, 16, 70, 71, 15, 53, 54, 180, 55, + 43, 44, 55, 56, 45, 55, 86, 553, 46, 74, - 74, 47, 69, 16, 70, 71, 138, 56, 55, 145, + 74, 47, 69, 16, 70, 71, 138, 55, 56, 145, 90, 141, 108, 57, 90, 90, 109, 127, 86, 177, 74, 51, 51, 139, 72, 171, 137, 144, 57, 15, 16, 17, 90, 58, 96, 96, 96, 96, 96, 96, @@ -871,72 +871,76 @@ static yyconst short int yy_nxt[3551] = 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 73, 553, 553, 553, 73, - 553, 73, 73, 73, 553, 73, 73, 73, 77, 77, + 73, 73, 73, 553, 553, 73, 73, 73, 77, 77, 553, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 84, 553, 553, 553, 84, 553, - 84, 84, 84, 84, 84, 84, 84, 87, 553, 553, - 553, 87, 553, 87, 87, 87, 553, 87, 87, 87, - 89, 553, 553, 89, 89, 553, 89, 89, 89, 553, - 89, 89, 89, 99, 99, 553, 553, 99, 124, 553, - 553, 124, 124, 553, 124, 124, 124, 553, 124, 124, - 124, 128, 553, 553, 128, 128, 128, 128, 128, 128, - 553, 553, 128, 128, 135, 135, 136, 553, 553, 136, - 553, 553, 136, 136, 136, 136, 136, 136, 136, 140, + 80, 80, 80, 80, 84, 553, 553, 553, 84, 84, + 84, 84, 84, 553, 84, 84, 84, 87, 553, 553, + 553, 87, 87, 87, 87, 553, 553, 87, 87, 87, + 89, 553, 553, 89, 89, 89, 89, 89, 553, 553, + 89, 89, 89, 99, 99, 553, 553, 553, 99, 124, + 553, 553, 124, 124, 124, 124, 124, 553, 553, 124, + 124, 124, 128, 553, 553, 128, 128, 128, 128, 128, + 553, 128, 553, 128, 128, 135, 135, 136, 553, 553, + 136, 553, 136, 136, 136, 136, 553, 136, 136, 136, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 142, 142, 553, 142, 553, 142, 142, 142, - 142, 142, 142, 142, 142, 78, 78, 553, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 150, 150, + 140, 140, 140, 142, 142, 553, 142, 553, 142, 142, + 142, 142, 142, 142, 142, 142, 78, 78, 553, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 151, 151, 553, 151, 151, 151, 151, 151, 151, - 151, 151, 151, 151, 152, 553, 553, 553, 152, 553, - 152, 152, 152, 553, 152, 152, 152, 90, 553, 553, - 90, 90, 553, 90, 90, 90, 553, 90, 90, 90, - 160, 160, 553, 553, 160, 162, 162, 162, 553, 553, - - 162, 125, 553, 553, 125, 125, 553, 125, 125, 125, - 553, 125, 125, 125, 186, 186, 186, 186, 186, 186, - 186, 186, 186, 186, 186, 186, 186, 193, 193, 553, - 553, 193, 199, 199, 199, 553, 553, 199, 227, 227, - 553, 553, 227, 228, 228, 553, 553, 228, 232, 232, - 553, 553, 232, 234, 234, 234, 553, 553, 234, 267, - 267, 553, 553, 267, 269, 269, 553, 553, 269, 270, - 270, 553, 553, 270, 272, 272, 272, 553, 553, 272, - 276, 276, 276, 276, 553, 553, 276, 304, 304, 553, - 553, 304, 305, 305, 553, 553, 305, 306, 306, 553, - - 553, 306, 318, 318, 318, 553, 553, 318, 319, 319, - 319, 319, 553, 553, 319, 352, 352, 553, 553, 352, - 353, 353, 553, 553, 353, 369, 369, 369, 553, 553, - 369, 370, 370, 370, 370, 553, 553, 370, 395, 395, - 553, 553, 395, 399, 553, 399, 399, 553, 553, 399, - 417, 417, 417, 553, 553, 417, 418, 418, 418, 418, - 553, 553, 418, 448, 448, 553, 553, 448, 449, 553, - 449, 449, 553, 553, 449, 465, 465, 465, 553, 553, - 465, 466, 466, 466, 553, 553, 553, 466, 472, 553, - 553, 553, 472, 553, 472, 472, 472, 553, 472, 472, - - 472, 474, 553, 553, 553, 474, 553, 474, 474, 474, - 553, 474, 474, 474, 484, 484, 553, 553, 484, 485, - 553, 485, 485, 553, 553, 485, 501, 501, 553, 553, - 553, 501, 503, 503, 503, 503, 503, 503, 503, 503, - 503, 503, 503, 503, 503, 516, 516, 553, 553, 516, - 517, 553, 517, 517, 553, 553, 517, 531, 531, 553, - 553, 531, 532, 553, 532, 553, 553, 553, 532, 544, - 553, 553, 553, 544, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 13, 553, 553, + 150, 150, 151, 151, 553, 151, 151, 151, 151, 151, + 151, 151, 151, 151, 151, 152, 553, 553, 553, 152, + 152, 152, 152, 553, 553, 152, 152, 152, 90, 553, + 553, 90, 90, 90, 90, 90, 553, 553, 90, 90, + 90, 160, 160, 553, 553, 553, 160, 162, 162, 162, + + 553, 553, 553, 162, 125, 553, 553, 125, 125, 125, + 125, 125, 553, 553, 125, 125, 125, 186, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 193, 193, 553, 553, 553, 193, 199, 199, 199, 553, + 553, 553, 199, 227, 227, 553, 553, 553, 227, 228, + 228, 553, 553, 553, 228, 232, 232, 553, 553, 553, + 232, 234, 234, 234, 553, 553, 553, 234, 267, 267, + 553, 553, 553, 267, 269, 269, 553, 553, 553, 269, + 270, 270, 553, 553, 553, 270, 272, 272, 272, 553, + 553, 553, 272, 276, 276, 276, 276, 553, 553, 553, + + 276, 304, 304, 553, 553, 553, 304, 305, 305, 553, + 553, 553, 305, 306, 306, 553, 553, 553, 306, 318, + 318, 318, 553, 553, 553, 318, 319, 319, 319, 319, + 553, 553, 553, 319, 352, 352, 553, 553, 553, 352, + 353, 353, 553, 553, 553, 353, 369, 369, 369, 553, + 553, 553, 369, 370, 370, 370, 370, 553, 553, 553, + 370, 395, 395, 553, 553, 553, 395, 399, 553, 399, + 399, 553, 553, 553, 399, 417, 417, 417, 553, 553, + 553, 417, 418, 418, 418, 418, 553, 553, 553, 418, + 448, 448, 553, 553, 553, 448, 449, 553, 449, 449, + + 553, 553, 553, 449, 465, 465, 465, 553, 553, 553, + 465, 466, 466, 466, 553, 553, 553, 553, 466, 472, + 553, 553, 553, 472, 472, 472, 472, 553, 553, 472, + 472, 472, 474, 553, 553, 553, 474, 474, 474, 474, + 553, 553, 474, 474, 474, 484, 484, 553, 553, 553, + 484, 485, 553, 485, 485, 553, 553, 553, 485, 501, + 501, 553, 553, 553, 553, 501, 503, 503, 503, 503, + 503, 503, 503, 503, 503, 503, 503, 503, 503, 516, + 516, 553, 553, 553, 516, 517, 553, 517, 517, 553, + 553, 553, 517, 531, 531, 553, 553, 553, 531, 532, + + 553, 532, 553, 553, 553, 553, 532, 544, 553, 553, + 553, 553, 544, 545, 545, 545, 545, 545, 545, 545, + 545, 545, 545, 545, 545, 545, 13, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, - 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, - 553, 553, 553, 553, 553, 553, 553, 553, 553, 553 + 553, 553, 553, 553, 553, 553, 553, 553, 553 } ; -static yyconst short int yy_chk[3551] = +static yyconst short int yy_chk[3590] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1265,69 +1269,73 @@ static yyconst short int yy_chk[3551] = 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, 558, 0, 0, 0, 558, - 0, 558, 558, 558, 0, 558, 558, 558, 559, 559, + 558, 558, 558, 0, 0, 558, 558, 558, 559, 559, 0, 559, 559, 559, 559, 559, 559, 559, 559, 559, 559, 560, 560, 560, 560, 560, 560, 560, 560, 560, - 560, 560, 560, 560, 561, 0, 0, 0, 561, 0, - 561, 561, 561, 561, 561, 561, 561, 562, 0, 0, - 0, 562, 0, 562, 562, 562, 0, 562, 562, 562, - 563, 0, 0, 563, 563, 0, 563, 563, 563, 0, - 563, 563, 563, 564, 564, 0, 0, 564, 565, 0, - 0, 565, 565, 0, 565, 565, 565, 0, 565, 565, - 565, 566, 0, 0, 566, 566, 566, 566, 566, 566, - 0, 0, 566, 566, 567, 567, 568, 0, 0, 568, - 0, 0, 568, 568, 568, 568, 568, 568, 568, 569, + 560, 560, 560, 560, 561, 0, 0, 0, 561, 561, + 561, 561, 561, 0, 561, 561, 561, 562, 0, 0, + 0, 562, 562, 562, 562, 0, 0, 562, 562, 562, + 563, 0, 0, 563, 563, 563, 563, 563, 0, 0, + 563, 563, 563, 564, 564, 0, 0, 0, 564, 565, + 0, 0, 565, 565, 565, 565, 565, 0, 0, 565, + 565, 565, 566, 0, 0, 566, 566, 566, 566, 566, + 0, 566, 0, 566, 566, 567, 567, 568, 0, 0, + 568, 0, 568, 568, 568, 568, 0, 568, 568, 568, 569, 569, 569, 569, 569, 569, 569, 569, 569, 569, - 569, 569, 570, 570, 0, 570, 0, 570, 570, 570, - 570, 570, 570, 570, 570, 571, 571, 0, 571, 571, - 571, 571, 571, 571, 571, 571, 571, 571, 572, 572, + 569, 569, 569, 570, 570, 0, 570, 0, 570, 570, + 570, 570, 570, 570, 570, 570, 571, 571, 0, 571, + 571, 571, 571, 571, 571, 571, 571, 571, 571, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, - 572, 573, 573, 0, 573, 573, 573, 573, 573, 573, - 573, 573, 573, 573, 574, 0, 0, 0, 574, 0, - 574, 574, 574, 0, 574, 574, 574, 575, 0, 0, - 575, 575, 0, 575, 575, 575, 0, 575, 575, 575, - 576, 576, 0, 0, 576, 577, 577, 577, 0, 0, - - 577, 578, 0, 0, 578, 578, 0, 578, 578, 578, - 0, 578, 578, 578, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 580, 580, 0, - 0, 580, 581, 581, 581, 0, 0, 581, 582, 582, - 0, 0, 582, 583, 583, 0, 0, 583, 584, 584, - 0, 0, 584, 585, 585, 585, 0, 0, 585, 586, - 586, 0, 0, 586, 587, 587, 0, 0, 587, 588, - 588, 0, 0, 588, 589, 589, 589, 0, 0, 589, - 590, 590, 590, 590, 0, 0, 590, 591, 591, 0, - 0, 591, 592, 592, 0, 0, 592, 593, 593, 0, - - 0, 593, 594, 594, 594, 0, 0, 594, 595, 595, - 595, 595, 0, 0, 595, 596, 596, 0, 0, 596, - 597, 597, 0, 0, 597, 598, 598, 598, 0, 0, - 598, 599, 599, 599, 599, 0, 0, 599, 600, 600, - 0, 0, 600, 601, 0, 601, 601, 0, 0, 601, - 602, 602, 602, 0, 0, 602, 603, 603, 603, 603, - 0, 0, 603, 604, 604, 0, 0, 604, 605, 0, - 605, 605, 0, 0, 605, 606, 606, 606, 0, 0, - 606, 607, 607, 607, 0, 0, 0, 607, 608, 0, - 0, 0, 608, 0, 608, 608, 608, 0, 608, 608, - - 608, 609, 0, 0, 0, 609, 0, 609, 609, 609, - 0, 609, 609, 609, 610, 610, 0, 0, 610, 611, - 0, 611, 611, 0, 0, 611, 612, 612, 0, 0, - 0, 612, 613, 613, 613, 613, 613, 613, 613, 613, - 613, 613, 613, 613, 613, 614, 614, 0, 0, 614, - 615, 0, 615, 615, 0, 0, 615, 616, 616, 0, - 0, 616, 617, 0, 617, 0, 0, 0, 617, 618, - 0, 0, 0, 618, 619, 619, 619, 619, 619, 619, - 619, 619, 619, 619, 619, 619, 619, 553, 553, 553, + 572, 572, 573, 573, 0, 573, 573, 573, 573, 573, + 573, 573, 573, 573, 573, 574, 0, 0, 0, 574, + 574, 574, 574, 0, 0, 574, 574, 574, 575, 0, + 0, 575, 575, 575, 575, 575, 0, 0, 575, 575, + 575, 576, 576, 0, 0, 0, 576, 577, 577, 577, + + 0, 0, 0, 577, 578, 0, 0, 578, 578, 578, + 578, 578, 0, 0, 578, 578, 578, 579, 579, 579, + 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, + 580, 580, 0, 0, 0, 580, 581, 581, 581, 0, + 0, 0, 581, 582, 582, 0, 0, 0, 582, 583, + 583, 0, 0, 0, 583, 584, 584, 0, 0, 0, + 584, 585, 585, 585, 0, 0, 0, 585, 586, 586, + 0, 0, 0, 586, 587, 587, 0, 0, 0, 587, + 588, 588, 0, 0, 0, 588, 589, 589, 589, 0, + 0, 0, 589, 590, 590, 590, 590, 0, 0, 0, + + 590, 591, 591, 0, 0, 0, 591, 592, 592, 0, + 0, 0, 592, 593, 593, 0, 0, 0, 593, 594, + 594, 594, 0, 0, 0, 594, 595, 595, 595, 595, + 0, 0, 0, 595, 596, 596, 0, 0, 0, 596, + 597, 597, 0, 0, 0, 597, 598, 598, 598, 0, + 0, 0, 598, 599, 599, 599, 599, 0, 0, 0, + 599, 600, 600, 0, 0, 0, 600, 601, 0, 601, + 601, 0, 0, 0, 601, 602, 602, 602, 0, 0, + 0, 602, 603, 603, 603, 603, 0, 0, 0, 603, + 604, 604, 0, 0, 0, 604, 605, 0, 605, 605, + + 0, 0, 0, 605, 606, 606, 606, 0, 0, 0, + 606, 607, 607, 607, 0, 0, 0, 0, 607, 608, + 0, 0, 0, 608, 608, 608, 608, 0, 0, 608, + 608, 608, 609, 0, 0, 0, 609, 609, 609, 609, + 0, 0, 609, 609, 609, 610, 610, 0, 0, 0, + 610, 611, 0, 611, 611, 0, 0, 0, 611, 612, + 612, 0, 0, 0, 0, 612, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 614, + 614, 0, 0, 0, 614, 615, 0, 615, 615, 0, + 0, 0, 615, 616, 616, 0, 0, 0, 616, 617, + + 0, 617, 0, 0, 0, 0, 617, 618, 0, 0, + 0, 0, 618, 619, 619, 619, 619, 619, 619, 619, + 619, 619, 619, 619, 619, 619, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, - 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, - 553, 553, 553, 553, 553, 553, 553, 553, 553, 553 + 553, 553, 553, 553, 553, 553, 553, 553, 553 } ; static yy_state_type yy_last_accepting_state; @@ -1458,7 +1466,7 @@ extern void yyerror __P((const char *)); #define INSTR 5 -#line 1462 "lex.yy.c" +#line 1470 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1614,7 +1622,7 @@ YY_DECL #line 128 "toke.l" -#line 1618 "lex.yy.c" +#line 1626 "lex.yy.c" if ( yy_init ) { @@ -1672,7 +1680,7 @@ yy_match: yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 3488 ); + while ( yy_base[yy_current_state] != 3527 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2268,7 +2276,7 @@ YY_RULE_SETUP #line 540 "toke.l" ECHO; YY_BREAK -#line 2272 "lex.yy.c" +#line 2280 "lex.yy.c" case YY_END_OF_BUFFER: { diff --git a/toke.l b/toke.l index f589f2bd8..bbb333bbd 100644 --- a/toke.l +++ b/toke.l @@ -221,7 +221,7 @@ DEFVAR [a-z_]+ return(COMMAND); } /* end of command line args */ - [^\\:, \t\n]+ { + [^#\\:, \t\n]+ { LEXTRACE("ARG "); if (!fill_args(yytext, yyleng, sawspace)) yyterminate();