chiark / gitweb /
Correct quoting of include-lookup directory. Closes:#837391. (With new directives...
[userv.git] / tokens.h
index 2ecf6a6ea2c5bd9ad7b59abee39778dc6f1dbe3a..d42cd536b2d1422fd1556b12245b9bae895b82c9 100644 (file)
--- a/tokens.h
+++ b/tokens.h
@@ -47,9 +47,10 @@ enum tokens {
   tokt_string=             0x01000000,
   tokt_execmode=           0x02000000,
   tokt_ehandlemode=        0x04000000,
-  tokt_builtinservice=     0x08000000,
-  tokt_misc=               0x10000000,
-  tokt_internal=           0x20000000,
+  tokt_lookupquotemode=    0x08000000,
+  tokt_builtinservice=     0x10000000,
+  tokt_misc=               0x20000000,
+  tokt_internal=           0x40000000,
 
   toki_word_reject=                                 0x00000001,
   toki_word_executefromdirectory=                   0x00000002,
@@ -58,105 +59,107 @@ enum tokens {
   toki_word_errorstostderr=                         0x00000005,
   toki_word_errorstosyslog=                         0x00000006,
   toki_word_errorstofile=                           0x00000007,
-  toki_word_requirefd=                              0x00000008,
-  toki_word_allowfd=                                0x00000009,
-  toki_word_nullfd=                                 0x0000000a,
-  toki_word_rejectfd=                               0x0000000b,
-  toki_word_ignorefd=                               0x0000000c,
-  toki_word_setenvironment=                         0x0000000d,
-  toki_word_nosetenvironment=                       0x0000000e,
-  toki_word_suppressargs=                           0x0000000f,
-  toki_word_nosuppressargs=                         0x00000010,
-  toki_word_disconnecthup=                          0x00000011,
-  toki_word_nodisconnecthup=                        0x00000012,
-  toki_word_cd=                                     0x00000013,
-  toki_word_userrcfile=                             0x00000014,
-  toki_word_include=                                0x00000015,
-  toki_word_includeifexist=                         0x00000016,
-  toki_word_includelookup=                          0x00000017,
-  toki_word_includelookupall=                       0x00000018,
-  toki_word_includedirectory=                       0x00000019,
-  toki_word_message=                                0x0000001a,
-  toki_word_includesysconfig=                       0x0000001b,
-  toki_word_includeuserrcfile=                      0x0000001c,
-  toki_word_includeclientconfig=                    0x0000001d,
-  toki_word_quit=                                   0x0000001e,
-  toki_word_eof=                                    0x0000001f,
-  toki_word_if=                                     0x00000020,
-  toki_word_catchquit=                              0x00000021,
-  toki_word_errorspush=                             0x00000022,
-  toki_word_elif=                                   0x00000023,
-  toki_word_else=                                   0x00000024,
-  toki_word_fi=                                     0x00000025,
-  toki_word_hctac=                                  0x00000026,
-  toki_word_srorre=                                 0x00000027,
-  toki_word_glob=                                   0x00000028,
-  toki_word_range=                                  0x00000029,
-  toki_word_grep=                                   0x0000002a,
-  toki_word_environment=                            0x0000002b,
-  toki_word_parameter=                              0x0000002c,
-  toki_word_version=                                0x0000002d,
-  toki_word_toplevel=                               0x0000002e,
-  toki_word_override=                               0x0000002f,
-  toki_word_shutdown=                               0x00000030,
-  toki_word_reset=                                  0x00000031,
-  toki_word_execute=                                0x00000032,
-  toki_word_help=                                   0x00000033,
-  toki_word_service=                                0x00000034,
-  toki_word_callinguser=                            0x00000035,
-  toki_word_callinggroup=                           0x00000036,
-  toki_word_callingusershell=                       0x00000037,
-  toki_word_serviceuser=                            0x00000038,
-  toki_word_servicegroup=                           0x00000039,
-  toki_word_serviceusershell=                       0x0000003a,
-  toki_syslog_debug=                                0x0000003b,
-  toki_syslog_info=                                 0x0000003c,
-  toki_syslog_notice=                               0x0000003d,
-  toki_syslog_warning=                              0x0000003e,
-  toki_syslog_err=                                  0x0000003f,
-  toki_syslog_crit=                                 0x00000040,
-  toki_syslog_alert=                                0x00000041,
-  toki_syslog_emerg=                                0x00000042,
-  toki_syslog_authpriv=                             0x00000043,
-  toki_syslog_cron=                                 0x00000044,
-  toki_syslog_daemon=                               0x00000045,
-  toki_syslog_kern=                                 0x00000046,
-  toki_syslog_lpr=                                  0x00000047,
-  toki_syslog_mail=                                 0x00000048,
-  toki_syslog_news=                                 0x00000049,
-  toki_syslog_syslog=                               0x0000004a,
-  toki_syslog_user=                                 0x0000004b,
-  toki_syslog_uucp=                                 0x0000004c,
-  toki_syslog_local0=                               0x0000004d,
-  toki_syslog_local1=                               0x0000004e,
-  toki_syslog_local2=                               0x0000004f,
-  toki_syslog_local3=                               0x00000050,
-  toki_syslog_local4=                               0x00000051,
-  toki_syslog_local5=                               0x00000052,
-  toki_syslog_local6=                               0x00000053,
-  toki_syslog_local7=                               0x00000054,
-  toki_word_read=                                   0x00000055,
-  toki_word_write=                                  0x00000056,
-  toki_ordinal=                                     0x00000057,
-  toki_fdrange=                                     0x00000058,
-  toki_fdstoend=                                    0x00000059,
-  toki_dollar=                                      0x0000005a,
-  toki_word_stdin=                                  0x0000005b,
-  toki_word_stdout=                                 0x0000005c,
-  toki_word_stderr=                                 0x0000005d,
-  toki_lwsp=                                        0x0000005e,
-  toki_newline=                                     0x0000005f,
-  toki_barestring=                                  0x00000060,
-  toki_quotedstring=                                0x00000061,
-  toki_eof=                                         0x00000062,
-  toki_quit=                                        0x00000063,
-  toki_error=                                       0x00000064,
-  toki_openparen=                                   0x00000065,
-  toki_closeparen=                                  0x00000066,
-  toki_not=                                         0x00000067,
-  toki_and=                                         0x00000068,
-  toki_or=                                          0x00000069,
-  toki_word_error=                                  0x0000006a,
+  toki_word_includelookupquoteold=                  0x00000008,
+  toki_word_includelookupquotenew=                  0x00000009,
+  toki_word_requirefd=                              0x0000000a,
+  toki_word_allowfd=                                0x0000000b,
+  toki_word_nullfd=                                 0x0000000c,
+  toki_word_rejectfd=                               0x0000000d,
+  toki_word_ignorefd=                               0x0000000e,
+  toki_word_setenvironment=                         0x0000000f,
+  toki_word_nosetenvironment=                       0x00000010,
+  toki_word_suppressargs=                           0x00000011,
+  toki_word_nosuppressargs=                         0x00000012,
+  toki_word_disconnecthup=                          0x00000013,
+  toki_word_nodisconnecthup=                        0x00000014,
+  toki_word_cd=                                     0x00000015,
+  toki_word_userrcfile=                             0x00000016,
+  toki_word_include=                                0x00000017,
+  toki_word_includeifexist=                         0x00000018,
+  toki_word_includelookup=                          0x00000019,
+  toki_word_includelookupall=                       0x0000001a,
+  toki_word_includedirectory=                       0x0000001b,
+  toki_word_message=                                0x0000001c,
+  toki_word_includesysconfig=                       0x0000001d,
+  toki_word_includeuserrcfile=                      0x0000001e,
+  toki_word_includeclientconfig=                    0x0000001f,
+  toki_word_quit=                                   0x00000020,
+  toki_word_eof=                                    0x00000021,
+  toki_word_if=                                     0x00000022,
+  toki_word_catchquit=                              0x00000023,
+  toki_word_errorspush=                             0x00000024,
+  toki_word_elif=                                   0x00000025,
+  toki_word_else=                                   0x00000026,
+  toki_word_fi=                                     0x00000027,
+  toki_word_hctac=                                  0x00000028,
+  toki_word_srorre=                                 0x00000029,
+  toki_word_glob=                                   0x0000002a,
+  toki_word_range=                                  0x0000002b,
+  toki_word_grep=                                   0x0000002c,
+  toki_word_environment=                            0x0000002d,
+  toki_word_parameter=                              0x0000002e,
+  toki_word_version=                                0x0000002f,
+  toki_word_toplevel=                               0x00000030,
+  toki_word_override=                               0x00000031,
+  toki_word_shutdown=                               0x00000032,
+  toki_word_reset=                                  0x00000033,
+  toki_word_execute=                                0x00000034,
+  toki_word_help=                                   0x00000035,
+  toki_word_service=                                0x00000036,
+  toki_word_callinguser=                            0x00000037,
+  toki_word_callinggroup=                           0x00000038,
+  toki_word_callingusershell=                       0x00000039,
+  toki_word_serviceuser=                            0x0000003a,
+  toki_word_servicegroup=                           0x0000003b,
+  toki_word_serviceusershell=                       0x0000003c,
+  toki_syslog_debug=                                0x0000003d,
+  toki_syslog_info=                                 0x0000003e,
+  toki_syslog_notice=                               0x0000003f,
+  toki_syslog_warning=                              0x00000040,
+  toki_syslog_err=                                  0x00000041,
+  toki_syslog_crit=                                 0x00000042,
+  toki_syslog_alert=                                0x00000043,
+  toki_syslog_emerg=                                0x00000044,
+  toki_syslog_authpriv=                             0x00000045,
+  toki_syslog_cron=                                 0x00000046,
+  toki_syslog_daemon=                               0x00000047,
+  toki_syslog_kern=                                 0x00000048,
+  toki_syslog_lpr=                                  0x00000049,
+  toki_syslog_mail=                                 0x0000004a,
+  toki_syslog_news=                                 0x0000004b,
+  toki_syslog_syslog=                               0x0000004c,
+  toki_syslog_user=                                 0x0000004d,
+  toki_syslog_uucp=                                 0x0000004e,
+  toki_syslog_local0=                               0x0000004f,
+  toki_syslog_local1=                               0x00000050,
+  toki_syslog_local2=                               0x00000051,
+  toki_syslog_local3=                               0x00000052,
+  toki_syslog_local4=                               0x00000053,
+  toki_syslog_local5=                               0x00000054,
+  toki_syslog_local6=                               0x00000055,
+  toki_syslog_local7=                               0x00000056,
+  toki_word_read=                                   0x00000057,
+  toki_word_write=                                  0x00000058,
+  toki_ordinal=                                     0x00000059,
+  toki_fdrange=                                     0x0000005a,
+  toki_fdstoend=                                    0x0000005b,
+  toki_dollar=                                      0x0000005c,
+  toki_word_stdin=                                  0x0000005d,
+  toki_word_stdout=                                 0x0000005e,
+  toki_word_stderr=                                 0x0000005f,
+  toki_lwsp=                                        0x00000060,
+  toki_newline=                                     0x00000061,
+  toki_barestring=                                  0x00000062,
+  toki_quotedstring=                                0x00000063,
+  toki_eof=                                         0x00000064,
+  toki_quit=                                        0x00000065,
+  toki_error=                                       0x00000066,
+  toki_openparen=                                   0x00000067,
+  toki_closeparen=                                  0x00000068,
+  toki_not=                                         0x00000069,
+  toki_and=                                         0x0000006a,
+  toki_or=                                          0x0000006b,
+  toki_word_error=                                  0x0000006c,
 
   tokv_word_reject=             tokt_directive|tokt_execmode|tokr_word|toki_word_reject,
   tokv_word_executefromdirectory=tokt_directive|tokt_execmode|tokr_word|toki_word_executefromdirectory,
@@ -165,6 +168,8 @@ enum tokens {
   tokv_word_errorstostderr=     tokt_directive|tokt_ehandlemode|tokr_word|toki_word_errorstostderr,
   tokv_word_errorstosyslog=     tokt_directive|tokt_ehandlemode|tokr_word|toki_word_errorstosyslog,
   tokv_word_errorstofile=       tokt_directive|tokt_ehandlemode|tokr_word|toki_word_errorstofile,
+  tokv_word_includelookupquoteold=tokt_directive|tokt_lookupquotemode|tokr_word|toki_word_includelookupquoteold,
+  tokv_word_includelookupquotenew=tokt_directive|tokt_lookupquotemode|tokr_word|toki_word_includelookupquotenew,
   tokv_word_requirefd=          tokt_directive|tokr_word|toki_word_requirefd,
   tokv_word_allowfd=            tokt_directive|tokr_word|toki_word_allowfd,
   tokv_word_nullfd=             tokt_directive|tokr_word|toki_word_nullfd,