| 1 |
*** src/atr_tab.c.orig Fri Oct 5 23:36:32 2007 |
|---|
| 2 |
--- src/atr_tab.c Sat Apr 26 00:05:34 2008 |
|---|
| 3 |
*************** |
|---|
| 4 |
*** 51,56 **** |
|---|
| 5 |
--- 51,57 ---- |
|---|
| 6 |
{"prefixmatch", '\0', AF_PREFIXMATCH, AF_PREFIXMATCH}, |
|---|
| 7 |
{"veiled", 'V', AF_VEILED, AF_VEILED}, |
|---|
| 8 |
{"debug", 'b', AF_DEBUG, AF_DEBUG}, |
|---|
| 9 |
+ {"no_debug", 'B', AF_NODEBUG, AF_NODEBUG}, |
|---|
| 10 |
{"public", 'p', AF_PUBLIC, AF_PUBLIC}, |
|---|
| 11 |
{"nearby", 'n', AF_NEARBY, AF_NEARBY}, |
|---|
| 12 |
{"noname", 'N', AF_NONAME, AF_NONAME}, |
|---|
| 13 |
*************** |
|---|
| 14 |
*** 78,83 **** |
|---|
| 15 |
--- 79,85 ---- |
|---|
| 16 |
{"prefixmatch", '\0', AF_PREFIXMATCH, AF_PREFIXMATCH}, |
|---|
| 17 |
{"veiled", 'V', AF_VEILED, AF_VEILED}, |
|---|
| 18 |
{"debug", 'b', AF_DEBUG, AF_DEBUG}, |
|---|
| 19 |
+ {"no_debug", 'B', AF_NODEBUG, AF_NODEBUG}, |
|---|
| 20 |
{"public", 'p', AF_PUBLIC, AF_PUBLIC}, |
|---|
| 21 |
{"nearby", 'n', AF_NEARBY, AF_NEARBY}, |
|---|
| 22 |
{"noname", 'N', AF_NONAME, AF_NONAME}, |
|---|
| 23 |
*** hdrs/attrib.h.orig Mon Jul 9 04:50:12 2007 |
|---|
| 24 |
--- hdrs/attrib.h Sat Apr 26 00:06:06 2008 |
|---|
| 25 |
*************** |
|---|
| 26 |
*** 128,134 **** |
|---|
| 27 |
#define AF_NOSPACE 0x10000000U /**< No space in did_it */ |
|---|
| 28 |
#define AF_MHEAR 0x20000000U /**< ^-listens can be triggered by %! */ |
|---|
| 29 |
#define AF_AHEAR 0x40000000U /**< ^-listens can be triggered by anyone */ |
|---|
| 30 |
! #define AF_UNDEF3 0x80000000U /**< Undefined; reserved for a future flag */ |
|---|
| 31 |
|
|---|
| 32 |
#define AF_MAXVALUE 0x100000000U /**< Largest attribute flag value. */ |
|---|
| 33 |
|
|---|
| 34 |
--- 128,134 ---- |
|---|
| 35 |
#define AF_NOSPACE 0x10000000U /**< No space in did_it */ |
|---|
| 36 |
#define AF_MHEAR 0x20000000U /**< ^-listens can be triggered by %! */ |
|---|
| 37 |
#define AF_AHEAR 0x40000000U /**< ^-listens can be triggered by anyone */ |
|---|
| 38 |
! #define AF_NODEBUG 0x80000000U /**< Don't show debug when this attr is evaluated */ |
|---|
| 39 |
|
|---|
| 40 |
#define AF_MAXVALUE 0x100000000U /**< Largest attribute flag value. */ |
|---|
| 41 |
|
|---|
| 42 |
*** hdrs/dbdefs.h.orig Tue Jun 12 23:21:48 2007 |
|---|
| 43 |
--- hdrs/dbdefs.h Sat Apr 26 00:11:39 2008 |
|---|
| 44 |
*************** |
|---|
| 45 |
*** 173,178 **** |
|---|
| 46 |
--- 173,179 ---- |
|---|
| 47 |
#define AF_Prefixmatch(a) ((a)->flags & AF_PREFIXMATCH) |
|---|
| 48 |
#define AF_Veiled(a) ((a)->flags & AF_VEILED) |
|---|
| 49 |
#define AF_Debug(a) ((a)->flags & AF_DEBUG) |
|---|
| 50 |
+ #define AF_NoDebug(a) ((a)->flags & AF_NODEBUG) |
|---|
| 51 |
#define AF_Nearby(a) ((a)->flags & AF_NEARBY) |
|---|
| 52 |
#define AF_Public(a) ((a)->flags & AF_PUBLIC) |
|---|
| 53 |
#define AF_Mhear(a) ((a)->flags & AF_MHEAR) |
|---|
| 54 |
*** src/funlist.c.orig Fri Oct 5 23:36:32 2007 |
|---|
| 55 |
--- src/funlist.c Sat Apr 26 00:15:44 2008 |
|---|
| 56 |
*************** |
|---|
| 57 |
*** 2400,2405 **** |
|---|
| 58 |
--- 2400,2407 ---- |
|---|
| 59 |
} |
|---|
| 60 |
if (AF_Debug(attrib)) |
|---|
| 61 |
pe_flags |= PE_DEBUG; |
|---|
| 62 |
+ if (AF_NoDebug(attrib)) |
|---|
| 63 |
+ pe_flags |= PE_NODEBUG; |
|---|
| 64 |
|
|---|
| 65 |
asave = safe_atr_value(attrib); |
|---|
| 66 |
|
|---|
| 67 |
*** src/parse.c.orig Mon Jul 9 04:50:12 2007 |
|---|
| 68 |
--- src/parse.c Sat Apr 26 00:21:39 2008 |
|---|
| 69 |
*************** |
|---|
| 70 |
*** 698,705 **** |
|---|
| 71 |
|
|---|
| 72 |
|
|---|
| 73 |
if (eflags != PE_NOTHING) { |
|---|
| 74 |
! debugging = (Debug(executor) || (eflags & PE_DEBUG)) |
|---|
| 75 |
! && (Connected(Owner(executor)) || atr_get(executor, "DEBUGFORWARDLIST")); |
|---|
| 76 |
if (debugging) { |
|---|
| 77 |
int j; |
|---|
| 78 |
char *debugp; |
|---|
| 79 |
--- 698,705 ---- |
|---|
| 80 |
|
|---|
| 81 |
|
|---|
| 82 |
if (eflags != PE_NOTHING) { |
|---|
| 83 |
! debugging = (!(eflags & PE_NODEBUG) && (Debug(executor) || (eflags & PE_DEBUG)) |
|---|
| 84 |
! && (Connected(Owner(executor)) || atr_get(executor, "DEBUGFORWARDLIST"))); |
|---|
| 85 |
if (debugging) { |
|---|
| 86 |
int j; |
|---|
| 87 |
char *debugp; |
|---|
| 88 |
*** hdrs/parse.h.orig Tue Jun 12 23:21:48 2007 |
|---|
| 89 |
--- hdrs/parse.h Sat Apr 26 00:09:38 2008 |
|---|
| 90 |
*************** |
|---|
| 91 |
*** 189,194 **** |
|---|
| 92 |
--- 189,195 ---- |
|---|
| 93 |
#define PE_DEBUG 0x00000400 |
|---|
| 94 |
#define PE_BUILTINONLY 0x00000800 |
|---|
| 95 |
#define PE_USERFN 0x00001000 |
|---|
| 96 |
+ #define PE_NODEBUG 0x00002000 |
|---|
| 97 |
|
|---|
| 98 |
#define PE_DEFAULT (PE_COMPRESS_SPACES | PE_STRIP_BRACES | \ |
|---|
| 99 |
PE_DOLLAR | PE_EVALUATE | PE_FUNCTION_CHECK) |
|---|
| 100 |
*** src/utils.c.orig Fri Oct 5 23:36:32 2007 |
|---|
| 101 |
--- src/utils.c Sat Apr 26 00:10:36 2008 |
|---|
| 102 |
*************** |
|---|
| 103 |
*** 191,196 **** |
|---|
| 104 |
--- 191,198 ---- |
|---|
| 105 |
/* DEBUG attributes */ |
|---|
| 106 |
if (AF_Debug(attrib)) |
|---|
| 107 |
pe_flags |= PE_DEBUG; |
|---|
| 108 |
+ if (AF_NoDebug(attrib)) |
|---|
| 109 |
+ pe_flags |= PE_NODEBUG; |
|---|
| 110 |
|
|---|
| 111 |
/* Populate the ufun object */ |
|---|
| 112 |
mush_strncpy(ufun->contents, atr_value(attrib), BUFFER_LEN); |
|---|
