-
Notifications
You must be signed in to change notification settings - Fork 0
/
1.8.4-patch01
15886 lines (14096 loc) · 447 KB
/
1.8.4-patch01
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
This is patch 1 for PennMUSH 1.8.4. After applying this patch, you
will have version 1.8.4p1
To apply this patch, save it to a file in your top-level 1.8.4p0 MUSH directory,
and do the following:
patch -p0 < 1.8.4-patch01
./configure
make install
If you use GNU patch 2.2, you probably want the above to be 'patch -b
-p0', not just 'patch -p0'.
Unix (or cygwin) users need not worry about failed hunks in
game/txt/hlp/index.hlp, src/switchinc.c, hdrs/switches.h, hdrs/cmds.h,
or hdrs/funs.h. These files are automatically rebuilt on compile. On
the off chance they appear not to be, simply rm them and re-run make.
Then @shutdown/reboot your MUSH.
- Shawn/Raevnos
In this patch:
Major Changes:
* You can now do the equivilent of @command/add, @hook, @function and
@attribute/access from alias.cnf and restrict.cnf, to add/configure
commands, functions and standard attributes. Suggested by Paige. [MG]
* Exits now use @alias for alternate names. The old style of
including aliases directly in names is still supported, but
depreciated in new construction. Suggested by [MG]. [SW]
Minor Changes:
* @power now reports when you try and set a power which is already set (or
clear one which isn't set), similar to @set. Suggested by Paige. [MG]
* Sorting methods now take - as a prefix to sort type in order to sort
in descending order. Suggested by Minion. [GM]
* The matching code no longer matches players who aren't nearby with
"*playername" when MAT_NEAR is given, more in line with other checks.
(This has virtually no impact for most players.) [MG]
* The internal pe_info (which manages the function invocation limit, among
other things) is now managed per-queue, not per-command argument. [MG]
* @chan/decompile now uses "*name" for players, and dbrefs for other
objects, when printing "@chan/on" statements. [MG]
* cpu_limit now works on Cygwin (though not quite as well as on unix).
A slightly higher limit may be needed than other platforms. [MG]
* The output from say, pose, semipose and @emit is now passed through the
SPEECHMOD attribute before being outputted. Suggested by Paige, based on
MUX and TinyMUSH. [MG]
* @config/list now accepts wildcard patterns to match against option names.
Suggested by Trinsec. [MG]
* The dreaded <Output flushed> message should show up a lot less frequently
on spammy debug output and the like. By popular demand. [SW]
* Added support for MSSP (Mud Server Status Protocol), based on patches by
Javelin and Teal. See mush.cnf for details. [MG]
* The script for updating config files is smarter about adding new alias
lines. [SW]
* @search now only charges for elock searches which use eval or indirect
locks.
* Added @mail/unread, to mark mail you've already read as new, and
@mail/status to change read/cleared/tagged status for messages.. Suggested
by qa'toq. [MG]
Commands:
* Add /preserve switch to @chzone and @chzoneall, like @chown/preserve.
* Rooms/exits must now have an @COST attribute in order to be given
pennies. Use @cost <ancestor>=%0 to enable giving to all rooms/exits. [MG]
* with/room can now check for commands in the Master Room or your ZMR, and
with can check for commands on your ZMT. [MG]
* @sitelock/register <host> now sets the access rules for <host> to be
"!create register", rather than "!create". Suggested by Trinsec. [MG]
Functions:
* remit() now works like @remit/list. Suggested by Minion. [MG]
* rand() now accepts negative arguments again. [MG]
* lcon() can now take a second argument to make it behave like lthings()
or l[v]players(), or makes it return only puppets/listening objects,
for MUX/Rhost compatability. Suggested by Bane. [MG]
* open() can now open rooms remotely. Suggested by Minion. [MG]
* reswitch() and co now perform $-replacements for subexpressions. [MG]
Fixes:
* Help fixes.
* @search's output can now include garbage objects, like lsearch().
Reported by Minion. [MG]
* The command parser incorrectly expanded the names of disabled built-in
commands prior to $-command matching. Reported by Mercutio. [MG]
* benchmark()'s average would be thrown off when the CPU limit was
exceeded during evaluation. Reported by Amberyl. [MG]
* Fix a few bugs in handling of command locks. [SW]
* Garbage objects could be matched by dbref. Reported by Paige. [MG]
* No longer complain about reboot.db not being present when we're not
doing a @shutdown/reboot anyway. Reported by Paige. [MG]
* The Telnet escape code was not properly escaped when sent literally to
Pueblo-aware clients. [MG]
* namelist() did not accept names in quotes. Reported by Amberyl. [MG]
* @attrib/access/retroactive could remove the 'root' flag from attribute
trees, making nasty things happen. Reported by Cooee. [MG]
* Fix fn() to check that the first arugment is actually the name of a
built-in function. Reported by Time and Cheetah. [DC]
* Nested @asserts/@breaks with no '=' would loop unintentionally.
Reported by Minion. [MG]
* Fixed a couple of small bugs in give/@cost. [MG]
* You can now always look at remote objects whose descs are not set nearby,
and can never look at remote objects with nearby descs. [MG]
* The chatdb didn't load correctly with invalid objects on channels. [MG]
* Fixed a crashbug in @boot on Windows. Reported by Daniel Powell. [MG]
* %q-registers did not carry over into @includes correctly. Reported by
Reaver. [MG]
* Double-free in follow command fixed. Reported by Anya@ST:DW. [MG]
* locate() sometimes returned #-2 when two objects matched, even if only
one of them was the preferred type. Reported by Minion. [MG]
CHANGES.184 | 94 +
Makefile.in | 2
Patchlevel | 2
game/access.README | 2
game/aliascnf.dst | 20
game/mushcnf.dst | 11
game/restart | 15
game/restrictcnf.dst | 9
game/txt/README | 44
game/txt/hlp/index.hlp | 773 ++++++-------
game/txt/hlp/pennchat.hlp | 2
game/txt/hlp/penncmd.hlp | 392 ++++--
game/txt/hlp/pennconf.hlp | 5
game/txt/hlp/pennfunc.hlp | 95 +
game/txt/hlp/pennmail.hlp | 14
game/txt/hlp/penntop.hlp | 18
game/txt/hlp/pennv184.hlp | 97 +
game/txt/hlp/pennvOLD.hlp | 2
hdrs/atr_tab.h | 1
hdrs/attrib.h | 3
hdrs/boolexp.h | 3
hdrs/command.h | 17
hdrs/conf.h | 17
hdrs/dbdefs.h | 2
hdrs/externs.h | 10
hdrs/extmail.h | 12
hdrs/function.h | 3
hdrs/game.h | 7
hdrs/mushtype.h | 7
hdrs/parse.h | 3
hdrs/svninfo.h | 2
hdrs/switches.h | 52
hdrs/version.h | 6
po/de_DE.pox | 4
po/hr_HR.pox | 171 ++-
po/nl_NL.pox | 69 -
po/no_NO.pox | 8
po/pennmush.pot | 2593 +++++++++++++++++++++++-----------------------
po/pl_PL.pox | 8
po/sv_SE.pox | 4
src/Makefile.in | 29
src/SWITCHES | 2
src/access.c | 22
src/atr_tab.c | 42
src/attrib.c | 93 -
src/boolexp.c | 39
src/bsd.c | 150 ++
src/chunk.c | 2
src/cmds.c | 14
src/command.c | 251 +++-
src/conf.c | 129 ++
src/cque.c | 17
src/db.c | 7
src/destroy.c | 2
src/extchat.c | 28
src/extmail.c | 95 +
src/flags.c | 66 -
src/funcrypt.c | 4
src/function.c | 94 +
src/fundb.c | 148 +-
src/funlist.c | 37
src/funmisc.c | 122 +-
src/funstr.c | 5
src/funufun.c | 10
src/game.c | 48
src/help.c | 7
src/ident.c | 2
src/info_master.c | 3
src/lock.c | 3
src/look.c | 20
src/malias.c | 1
src/markup.c | 70 -
src/match.c | 30
src/memcheck.c | 6
src/mymalloc.c | 4
src/mysocket.c | 3
src/myssl.c | 8
src/notify.c | 9
src/parse.c | 60 -
src/pcre.c | 8
src/plyrlist.c | 4
src/predicat.c | 5
src/rob.c | 19
src/set.c | 16
src/sort.c | 66 -
src/speech.c | 55
src/sql.c | 3
src/strutil.c | 28
src/switchinc.c | 2
src/timer.c | 24
src/utils.c | 6
src/wait.c | 2
src/wiz.c | 77 -
utils/update-cnf.pl | 320 +++--
utils/update.pl | 255 ++--
95 files changed, 4390 insertions(+), 2781 deletions(-)
Prereq: 1.8.4.0
===================================================================
--- Patchlevel (.../184p0) (revision 575)
+++ Patchlevel (.../184p1) (revision 575)
@@ -1,3 +1,3 @@
Do not edit this file. It is maintained by the official PennMUSH patches.
-This is PennMUSH 1.8.4.0
+This is PennMUSH 1.8.4p1
Index: Makefile.in
===================================================================
--- Makefile.in (.../184p0) (revision 575)
+++ Makefile.in (.../184p1) (revision 575)
@@ -3,7 +3,7 @@
# - System configuration - #
VERSION=1.8.4
-PATCHLEVEL=0
+PATCHLEVEL=1
#
# This section of the file should be automatically configured by the
Index: src/mysocket.c
===================================================================
--- src/mysocket.c (.../184p0) (revision 575)
+++ src/mysocket.c (.../184p1) (revision 575)
@@ -176,7 +176,6 @@
char cport[NI_MAXSERV];
int s;
int res;
- int err;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC; /* Try to use IPv6 if available */
@@ -216,7 +215,7 @@
penn_perror("bind failed (Possibly harmless)");
}
- if ((err = connect_nonb(s, server->ai_addr, server->ai_addrlen, nonb)) == 0)
+ if (connect_nonb(s, server->ai_addr, server->ai_addrlen, nonb) == 0)
break;
#ifdef DEBUG
Index: src/fundb.c
===================================================================
--- src/fundb.c (.../184p0) (revision 575)
+++ src/fundb.c (.../184p1) (revision 575)
@@ -38,7 +38,7 @@
char const *pattern, ATTR *atr, void *args);
static dbref dbwalk(char *buff, char **bp, dbref executor, dbref enactor,
int type, dbref loc, dbref after, int skipdark,
- int start, int count, int *retcount);
+ int start, int count, int listening, int *retcount);
const char *
do_get_attrib(dbref executor, dbref thing, const char *attrib)
@@ -653,7 +653,7 @@
static dbref
dbwalk(char *buff, char **bp, dbref executor, dbref enactor,
int type, dbref loc, dbref after, int skipdark,
- int start, int count, int *retcount)
+ int start, int count, int listening, int *retcount)
{
dbref result;
int first;
@@ -661,6 +661,7 @@
dbref thing;
int validloc;
dbref startdb;
+ int privwho = Priv_Who(executor);
nthing = 0;
@@ -696,6 +697,12 @@
(skipdark && Dark(thing) && !Light(thing) && !Light(loc)) ||
((type == TYPE_PLAYER) && skipdark && !Connected(thing)))
continue;
+ if ((listening == 1 && !Puppet(thing)) || (listening == 2 &&
+ !((Hearer(thing)
+ || Listener(thing))
+ && (privwho
+ || !Dark(thing)))))
+ continue;
nthing += 1;
if (count < 1 || (nthing >= start && nthing < start + count)) {
if (buff) {
@@ -728,6 +735,7 @@
int vis = 0;
int type = 0;
int result = 0;
+ int listening = 0;
const char *ptr = called_as;
char *buffptr = buff;
char **bptr = bp;
@@ -736,50 +744,71 @@
buffptr = buff;
bptr = bp;
- switch (*(ptr++)) {
- case 'X':
- if (!is_strict_integer(args[1]) || !is_strict_integer(args[2])) {
- safe_str(T(e_int), buff, bp);
+ if (!strcmp(called_as, "LCON") && nargs == 2) {
+ if (string_prefix("player", args[1])) {
+ type = TYPE_PLAYER;
+ } else if (string_prefix("object", args[1])
+ || string_prefix("thing", args[1])) {
+ type = TYPE_THING;
+ } else if (string_prefix("connect", args[1])) {
+ type = TYPE_PLAYER;
+ vis = 1;
+ } else if (string_prefix("puppet", args[1])) {
+ type = TYPE_THING;
+ listening = 1;
+ } else if (string_prefix("listen", args[1])) {
+ type = TYPE_THING | TYPE_PLAYER;
+ listening = 2;
+ } else {
+ safe_str("#-1", buff, bp);
return;
}
- start = parse_integer(args[1]);
- count = parse_integer(args[2]);
- if (start < 1 || count < 1) {
- safe_str(T("#-1 ARGUMENT OUT OF RANGE"), buff, bp);
- return;
+ } else {
+ switch (*(ptr++)) {
+ case 'X':
+ if (!is_strict_integer(args[1]) || !is_strict_integer(args[2])) {
+ safe_str(T(e_int), buff, bp);
+ return;
+ }
+ start = parse_integer(args[1]);
+ count = parse_integer(args[2]);
+ if (start < 1 || count < 1) {
+ safe_str(T("#-1 ARGUMENT OUT OF RANGE"), buff, bp);
+ return;
+ }
+ break;
+ case 'N':
+ buffptr = NULL;
+ bptr = NULL;
+ break;
}
- break;
- case 'N':
- buffptr = NULL;
- bptr = NULL;
- break;
- }
- if (*ptr == 'V') {
- vis = 1;
- ptr++;
- }
+ if (*ptr == 'V') {
+ vis = 1;
+ ptr++;
+ }
- switch (*ptr) {
- case 'C': /* con */
- type = TYPE_THING | TYPE_PLAYER;
- break;
- case 'T': /* things */
- type = TYPE_THING;
- break;
- case 'P': /* players */
- type = TYPE_PLAYER;
- break;
- case 'E': /* exits */
- type = TYPE_EXIT;
- break;
- default:
- /* This should never be reached ... */
- type = TYPE_THING | TYPE_PLAYER;
+ switch (*ptr) {
+ case 'C': /* con */
+ type = TYPE_THING | TYPE_PLAYER;
+ break;
+ case 'T': /* things */
+ type = TYPE_THING;
+ break;
+ case 'P': /* players */
+ type = TYPE_PLAYER;
+ break;
+ case 'E': /* exits */
+ type = TYPE_EXIT;
+ break;
+ default:
+ /* This should never be reached ... */
+ type = TYPE_THING | TYPE_PLAYER;
+ }
}
dbwalk(buffptr, bptr, executor, enactor, type, loc, NOTHING,
- vis, start, count, &result);
+ vis, start, count, listening, &result);
if (!buffptr) {
safe_integer(result, buff, bp);
@@ -792,7 +821,7 @@
dbref loc = match_thing(executor, args[0]);
safe_dbref(dbwalk
(NULL, NULL, executor, enactor, TYPE_THING | TYPE_PLAYER, loc,
- NOTHING, 0, 0, 0, NULL), buff, bp);
+ NOTHING, 0, 0, 0, 0, NULL), buff, bp);
}
/* ARGSUSED */
@@ -801,7 +830,7 @@
dbref loc = match_thing(executor, args[0]);
safe_dbref(dbwalk
(NULL, NULL, executor, enactor, TYPE_EXIT, loc, NOTHING, 0, 0, 0,
- NULL), buff, bp);
+ 0, NULL), buff, bp);
}
/* ARGSUSED */
@@ -814,13 +843,13 @@
case TYPE_EXIT:
safe_dbref(dbwalk
(NULL, NULL, executor, enactor, TYPE_EXIT, Source(it), it, 0,
- 0, 0, NULL), buff, bp);
+ 0, 0, 0, NULL), buff, bp);
break;
case TYPE_THING:
case TYPE_PLAYER:
safe_dbref(dbwalk
(NULL, NULL, executor, enactor, TYPE_THING | TYPE_PLAYER,
- Location(it), it, 0, 0, 0, NULL), buff, bp);
+ Location(it), it, 0, 0, 0, 0, NULL), buff, bp);
break;
default:
safe_str("#-1", buff, bp);
@@ -1601,7 +1630,7 @@
return;
}
if (FUNCTION_SIDE_EFFECTS)
- (void) do_chzone(executor, args[0], args[1], 1);
+ (void) do_chzone(executor, args[0], args[1], 1, 0);
else {
safe_str(T(e_disabled), buff, bp);
return;
@@ -1802,9 +1831,19 @@
FUNCTION(fun_fullname)
{
dbref it = match_thing(executor, args[0]);
- if (GoodObject(it))
+ if (GoodObject(it)) {
safe_str(Name(it), buff, bp);
- else
+ if (IsExit(it)) {
+ ATTR *a = atr_get_noparent(it, "ALIAS");
+ if (a) {
+ char *aliases = atr_value(a);
+ if (aliases && *aliases) {
+ safe_chr(';', buff, bp);
+ safe_str(aliases, buff, bp);
+ }
+ }
+ }
+ } else
safe_str(T(e_notvis), buff, bp);
}
@@ -1869,7 +1908,7 @@
int first = 1;
char *current;
dbref target;
- char *start;
+ const char *start;
int report = 0;
ufun_attrib ufun;
char *wenv[2];
@@ -1883,12 +1922,12 @@
}
}
- start = trim_space_sep(args[0], ' ');
+ start = (const char *) args[0];
while (start && *start) {
if (!first)
safe_chr(' ', buff, bp);
first = 0;
- current = split_token(&start, ' ');
+ current = next_in_list(&start);
if (*current == '*')
current = current + 1;
target = lookup_player(current);
@@ -2083,6 +2122,7 @@
/* ARGSUSED */
FUNCTION(fun_open)
{
+ dbref source = NOTHING;
if (!FUNCTION_SIDE_EFFECTS) {
safe_str(T(e_disabled), buff, bp);
return;
@@ -2091,7 +2131,17 @@
safe_str(T(e_perm), buff, bp);
return;
}
- safe_dbref(do_real_open(executor, args[0], args[1], NOTHING), buff, bp);
+ if (nargs > 2) {
+ source = match_result(executor, args[2], TYPE_ROOM,
+ MAT_HERE | MAT_ABSOLUTE | MAT_TYPE);
+ if (source == NOTHING) {
+ safe_str(T("#-1 INVALID SOURCE ROOM"), buff, bp);
+ return;
+ }
+ }
+ safe_dbref(do_real_open
+ (executor, args[0], (nargs > 1 ? args[1] : NULL), source), buff,
+ bp);
}
/* ARGSUSED */
Index: src/sql.c
===================================================================
--- src/sql.c (.../184p0) (revision 575)
+++ src/sql.c (.../184p1) (revision 575)
@@ -882,8 +882,7 @@
static void
penn_mysql_free_sql_query(MYSQL_RES * qres)
{
- MYSQL_ROW row_p;
- while ((row_p = mysql_fetch_row(qres)) != NULL) ;
+ while (mysql_fetch_row(qres)) ;
mysql_free_result(qres);
}
Index: src/utils.c
===================================================================
--- src/utils.c (.../184p0) (revision 575)
+++ src/utils.c (.../184p1) (revision 575)
@@ -557,7 +557,7 @@
"Couldn't read from /dev/urandom! Resorting to normal seeding method.");
} else {
do_rawlog(LT_ERR, "Seeded RNG from /dev/urandom");
- init_by_array(buf, r / sizeof(unsigned long));
+ init_by_array(buf, r / sizeof(uint32_t));
return;
}
} else
@@ -658,9 +658,7 @@
return n;
}
- mush_strncpy(n, s, BUFFER_LEN);
- if ((s = strchr(n, ';')))
- *s = '\0';
+ copy_up_to(n, s, ';');
return n;
}
Index: src/extchat.c
===================================================================
--- src/extchat.c (.../184p0) (revision 575)
+++ src/extchat.c (.../184p1) (revision 575)
@@ -520,7 +520,7 @@
char *tmp;
CHANUSER *user;
dbref player;
- for (i = 0; i < ChanNumUsers(ch); i++) {
+ for (i = ChanNumUsers(ch); i > 0; i--) {
db_read_this_labeled_dbref(fp, "dbref", &player);
/* Don't bother if the player isn't a valid dbref or the wrong type */
if (GoodObject(player) && Chan_Ok_Type(ch, player)) {
@@ -1265,7 +1265,7 @@
notify_format(player,
T("CHAT: You join %s to channel <%s>."), Name(victim),
ChanName(chan));
- u = onchannel(victim, chan);
+ onchannel(victim, chan);
ChanNumUsers(chan)++;
if (!Channel_Quiet(chan) && !DarkLegal(victim)) {
channel_send(chan, victim,
@@ -1318,7 +1318,6 @@
channel_join_self(dbref player, const char *name)
{
CHAN *chan = NULL;
- CHANUSER *u;
if (Guest(player)) {
notify(player, T("Guests are not allowed to join channels."));
@@ -1364,7 +1363,7 @@
}
if (insert_user_by_dbref(player, chan)) {
notify_format(player, T("CHAT: You join channel <%s>."), ChanName(chan));
- u = onchannel(player, chan);
+ onchannel(player, chan);
ChanNumUsers(chan)++;
if (!Channel_Quiet(chan) && !DarkLegal(player))
channel_send(chan, player,
@@ -1530,7 +1529,6 @@
do_chat(dbref player, CHAN *chan, const char *arg1)
{
CHANUSER *u;
- const char *gap;
char type;
bool canhear;
@@ -1569,11 +1567,9 @@
}
/* figure out what kind of message we have */
- gap = " ";
type = ':';
switch (*arg1) {
case SEMI_POSE_TOKEN:
- gap = "";
type = ';';
/* FALLTHRU */
case POSE_TOKEN:
@@ -2824,10 +2820,15 @@
bufferq_blocks(ChanBufferQ(c)));
if (!brief) {
for (u = ChanUsers(c); u; u = u->next) {
- if (!Chanuser_Hide(u) || Priv_Who(player))
-
- notify_format(player, "@channel/on %s = %s", ChanName(c),
- Name(CUdbref(u)));
+ if (!Chanuser_Hide(u) || Priv_Who(player)) {
+ if (IsPlayer(CUdbref(u))) {
+ notify_format(player, "@channel/on %s = *%s", ChanName(c),
+ Name(CUdbref(u)));
+ } else {
+ notify_format(player, "@channel/on %s = #%d", ChanName(c),
+ CUdbref(u));
+ }
+ }
}
}
}
@@ -3801,8 +3802,7 @@
}
if (recall_timestring) {
num_lines = 0;
- while ((buf =
- iter_bufferq(ChanBufferQ(chan), &p, &speaker, &type, ×tamp))) {
+ while (iter_bufferq(ChanBufferQ(chan), &p, &speaker, &type, ×tamp)) {
if (timestamp >= recall_from)
num_lines++;
}
@@ -3818,7 +3818,7 @@
all = (start <= 0 && num_lines >= BufferQNum(ChanBufferQ(chan)));
notify_format(player, T("CHAT: Recall from channel <%s>"), ChanName(chan));
while (start > 0) {
- buf = iter_bufferq(ChanBufferQ(chan), &p, &speaker, &type, ×tamp);
+ iter_bufferq(ChanBufferQ(chan), &p, &speaker, &type, ×tamp);
start--;
}
while ((buf = iter_bufferq(ChanBufferQ(chan), &p, &speaker, &type,
Index: src/Makefile.in
===================================================================
--- src/Makefile.in (.../184p0) (revision 575)
+++ src/Makefile.in (.../184p1) (revision 575)
@@ -368,6 +368,7 @@
chunk.o: ../confmagic.h
chunk.o: ../hdrs/mypcre.h
chunk.o: ../hdrs/command.h
+chunk.o: ../hdrs/boolexp.h
chunk.o: ../hdrs/switches.h
chunk.o: ../hdrs/intrface.h
chunk.o: ../hdrs/log.h
@@ -390,6 +391,7 @@
cmdlocal.o: ../hdrs/mypcre.h
cmdlocal.o: ../hdrs/parse.h
cmdlocal.o: ../hdrs/command.h
+cmdlocal.o: ../hdrs/boolexp.h
cmdlocal.o: ../hdrs/switches.h
cmdlocal.o: ../hdrs/cmds.h
cmds.o: ../hdrs/copyrite.h
@@ -448,6 +450,7 @@
command.o: ../hdrs/strtree.h
command.o: ../hdrs/function.h
command.o: ../hdrs/command.h
+command.o: ../hdrs/boolexp.h
command.o: ../hdrs/switches.h
command.o: ../hdrs/mymalloc.h
command.o: ../hdrs/log.h
@@ -493,6 +496,7 @@
conf.o: ../hdrs/pueblo.h
conf.o: ../hdrs/parse.h
conf.o: ../hdrs/command.h
+conf.o: ../hdrs/boolexp.h
conf.o: ../hdrs/switches.h
conf.o: ../hdrs/log.h
conf.o: ../hdrs/game.h
@@ -506,16 +510,17 @@
cque.o: ../hdrs/mushtype.h
cque.o: ../hdrs/htab.h
cque.o: ../hdrs/command.h
+cque.o: ../hdrs/boolexp.h
+cque.o: ../hdrs/chunk.h
+cque.o: ../hdrs/dbio.h
cque.o: ../hdrs/switches.h
cque.o: ../hdrs/mushdb.h
cque.o: ../hdrs/flags.h
cque.o: ../hdrs/ptab.h
-cque.o: ../hdrs/dbio.h
cque.o: ../hdrs/match.h
cque.o: ../hdrs/externs.h
cque.o: ../hdrs/compile.h
cque.o: ../hdrs/dbdefs.h
-cque.o: ../hdrs/chunk.h
cque.o: ../confmagic.h
cque.o: ../hdrs/mypcre.h
cque.o: ../hdrs/parse.h
@@ -607,6 +612,7 @@
destroy.o: ../hdrs/attrib.h
destroy.o: ../hdrs/lock.h
destroy.o: ../hdrs/boolexp.h
+destroy.o: ../hdrs/parse.h
extchat.o: ../hdrs/copyrite.h
extchat.o: ../config.h
extchat.o: ../hdrs/conf.h
@@ -721,6 +727,7 @@
flags.o: ../confmagic.h
flags.o: ../hdrs/mypcre.h
flags.o: ../hdrs/command.h
+flags.o: ../hdrs/boolexp.h
flags.o: ../hdrs/switches.h
flags.o: ../hdrs/attrib.h
flags.o: ../hdrs/parse.h
@@ -728,7 +735,6 @@
flags.o: ../hdrs/privtab.h
flags.o: ../hdrs/game.h
flags.o: ../hdrs/lock.h
-flags.o: ../hdrs/boolexp.h
flags.o: ../hdrs/log.h
flags.o: ../hdrs/sort.h
flags.o: ../hdrs/mymalloc.h
@@ -808,11 +814,11 @@
fundb.o: ../hdrs/match.h
fundb.o: ../hdrs/parse.h
fundb.o: ../hdrs/command.h
+fundb.o: ../hdrs/boolexp.h
fundb.o: ../hdrs/switches.h
fundb.o: ../hdrs/game.h
fundb.o: ../hdrs/privtab.h
fundb.o: ../hdrs/lock.h
-fundb.o: ../hdrs/boolexp.h
fundb.o: ../hdrs/log.h
fundb.o: ../hdrs/attrib.h
fundb.o: ../hdrs/function.h
@@ -839,10 +845,10 @@
funlist.o: ../hdrs/mymalloc.h
funlist.o: ../hdrs/match.h
funlist.o: ../hdrs/command.h
+funlist.o: ../hdrs/boolexp.h
funlist.o: ../hdrs/switches.h
funlist.o: ../hdrs/attrib.h
funlist.o: ../hdrs/lock.h
-funlist.o: ../hdrs/boolexp.h
funlist.o: ../hdrs/sort.h
funlocal.o: ../hdrs/copyrite.h
funlocal.o: ../config.h
@@ -976,6 +982,7 @@
funufun.o: ../hdrs/attrib.h
funufun.o: ../hdrs/lock.h
funufun.o: ../hdrs/boolexp.h
+funufun.o: ../hdrs/function.h
game.o: ../hdrs/copyrite.h
game.o: ../config.h
game.o: ../hdrs/conf.h
@@ -1031,6 +1038,7 @@
help.o: ../confmagic.h
help.o: ../hdrs/mypcre.h
help.o: ../hdrs/command.h
+help.o: ../hdrs/boolexp.h
help.o: ../hdrs/switches.h
help.o: ../hdrs/help.h
help.o: ../hdrs/log.h
@@ -1054,6 +1062,7 @@
htab.o: ../hdrs/chunk.h
htab.o: ../confmagic.h
htab.o: ../hdrs/mypcre.h
+htab.o: ../hdrs/log.h
htab.o: ../hdrs/mymalloc.h
ident.o: ../config.h
ident.o: ../hdrs/conf.h
@@ -1111,9 +1120,9 @@
local.o: ../hdrs/mypcre.h
local.o: ../hdrs/parse.h
local.o: ../hdrs/command.h
+local.o: ../hdrs/boolexp.h
local.o: ../hdrs/switches.h
local.o: ../hdrs/lock.h
-local.o: ../hdrs/boolexp.h
lock.o: ../hdrs/copyrite.h
lock.o: ../config.h
lock.o: ../hdrs/conf.h
@@ -1253,6 +1262,7 @@
match.o: ../hdrs/case.h
match.o: ../hdrs/match.h
match.o: ../hdrs/parse.h
+match.o: ../hdrs/attrib.h
memcheck.o: ../config.h
memcheck.o: ../hdrs/conf.h
memcheck.o: ../hdrs/copyrite.h
@@ -1607,16 +1617,17 @@
set.o: ../hdrs/attrib.h
set.o: ../hdrs/ansi.h
set.o: ../hdrs/command.h
+set.o: ../hdrs/boolexp.h
set.o: ../hdrs/switches.h
set.o: ../hdrs/mymalloc.h
set.o: ../hdrs/lock.h
-set.o: ../hdrs/boolexp.h
set.o: ../hdrs/log.h
set.o: ../hdrs/game.h
SFMT.o: ../config.h
SFMT.o: ../hdrs/SFMT.h
SFMT.o: ../hdrs/SFMT-params.h
SFMT.o: ../hdrs/SFMT-params19937.h
+SFMT.o: ../hdrs/SFMT-sse2.h
shs.o: ../hdrs/copyrite.h
shs.o: ../config.h
sig.o: ../config.h
@@ -1654,6 +1665,7 @@
sort.o: ../hdrs/parse.h
sort.o: ../hdrs/ansi.h
sort.o: ../hdrs/command.h
+sort.o: ../hdrs/boolexp.h
sort.o: ../hdrs/switches.h
sort.o: ../hdrs/sort.h
speech.o: ../hdrs/copyrite.h
@@ -1700,6 +1712,7 @@
sql.o: ../hdrs/log.h
sql.o: ../hdrs/parse.h
sql.o: ../hdrs/command.h
+sql.o: ../hdrs/boolexp.h
sql.o: ../hdrs/switches.h
sql.o: ../hdrs/function.h
sql.o: ../hdrs/ansi.h
@@ -1841,6 +1854,7 @@
version.o: ../hdrs/mypcre.h
version.o: ../hdrs/version.h
version.o: ../hdrs/buildinf.h
+version.o: ../hdrs/svninfo.h
wait.o: ../config.h
warnings.o: ../config.h
warnings.o: ../hdrs/copyrite.h
@@ -1910,3 +1924,4 @@
wiz.o: ../hdrs/command.h
wiz.o: ../hdrs/switches.h
wiz.o: ../hdrs/extmail.h
+wiz.o: ../hdrs/ansi.h
Index: src/malias.c
===================================================================
--- src/malias.c (.../184p0) (revision 575)
+++ src/malias.c (.../184p1) (revision 575)
@@ -869,7 +869,6 @@
notify(player, T("Permission denied."));
return;
}
- i = 0;
/*
* Parse the player list
Index: src/myssl.c
===================================================================
--- src/myssl.c (.../184p0) (revision 575)
+++ src/myssl.c (.../184p1) (revision 575)
@@ -114,8 +114,8 @@
SSL_CTX *
ssl_init(char *private_key_file, char *ca_file, int req_client_cert)
{
- const SSL_METHOD *meth; /* If this const gives you a warning, you're
- using an old version of OpenSSL. */
+ const SSL_METHOD *meth; /* If this const gives you a warning, you're
+ using an old version of OpenSSL. */
unsigned char context[128];
DH *dh;
unsigned int reps = 1;
@@ -359,10 +359,9 @@
{
int ret;
int state = 0;
- int err;
if ((ret = SSL_do_handshake(ssl)) <= 0) {
- switch (err = SSL_get_error(ssl, ret)) {
+ switch (SSL_get_error(ssl, ret)) {
case SSL_ERROR_WANT_READ:
/* We must want for the socket to be readable, and then repeat
* the call.
@@ -542,7 +541,6 @@
switch (SSL_get_error(ssl, r)) {
case SSL_ERROR_NONE:
/* We wrote something, but maybe not all */
- bufsize -= r;
*offset += r;
break;
case SSL_ERROR_WANT_WRITE:
Index: src/wiz.c
===================================================================
--- src/wiz.c (.../184p0) (revision 575)
+++ src/wiz.c (.../184p1) (revision 575)
@@ -47,6 +47,8 @@
#include "command.h"
#include "dbdefs.h"
#include "extmail.h"
+#include "boolexp.h"
+#include "ansi.h"
#include "confmagic.h"
@@ -806,7 +808,7 @@
void
do_boot(dbref player, const char *name, enum boot_type flag, int silent)
{
- dbref victim;
+ dbref victim = NOTHING;
DESC *d = NULL;
int count = 0;
int priv = Can_Boot(player);
@@ -951,7 +953,7 @@
* \param target string containing new zone master for objects.
*/
void
-do_chzoneall(dbref player, const char *name, const char *target)
+do_chzoneall(dbref player, const char *name, const char *target, bool preserve)
{
int i;
dbref victim;
@@ -989,7 +991,7 @@
* consistency on things like flag resetting, etc... */
for (i = 0; i < db_top; i++) {
if (Owner(i) == victim && Zone(i) != zone) {
- count += do_chzone(player, unparse_dbref(i), target, 0);
+ count += do_chzone(player, unparse_dbref(i), target, 0, preserve);
}
}
notify_format(player, T("Zone changed for %d objects."), count);
@@ -1221,13 +1223,14 @@
} else if (nresults > 0) {
/* Split the results up by type and report. */
int n;
- int nthings = 0, nexits = 0, nrooms = 0, nplayers = 0;
- dbref *things, *exits, *rooms, *players;
+ int nthings = 0, nexits = 0, nrooms = 0, nplayers = 0, ngarbage = 0;
+ dbref *things, *exits, *rooms, *players, *garbage;
things = mush_calloc(nresults, sizeof(dbref), "dbref_list");
exits = mush_calloc(nresults, sizeof(dbref), "dbref_list");
rooms = mush_calloc(nresults, sizeof(dbref), "dbref_list");
players = mush_calloc(nresults, sizeof(dbref), "dbref_list");
+ garbage = mush_calloc(nresults, sizeof(dbref), "dbref_list");
for (n = 0; n < nresults; n++) {
switch (Typeof(results[n])) {
@@ -1243,6 +1246,9 @@
case TYPE_PLAYER:
players[nplayers++] = results[n];
break;
+ case TYPE_GARBAGE:
+ garbage[ngarbage++] = results[n];
+ break;
default:
/* Unknown type. Ignore. */
do_rawlog(LT_ERR, "Weird type for dbref #%d", results[n]);
@@ -1314,15 +1320,34 @@
}
}
+ if (ngarbage) {
+ notify(player, T("\nGARBAGE:"));
+ for (n = 0; n < ngarbage; n++) {
+ tbp = tbuf;
+ if (ANSI_NAMES && ShowAnsi(player))
+ notify_format(player, T("%sGarbage%s(#%d)"), ANSI_HILITE, ANSI_END,
+ garbage[n]);
+ else
+ notify_format(player, T("Garbage(#%d)"), garbage[n]);
+ }
+ }
+
notify(player, T("---------- Search Done ----------"));
- notify_format(player,
- T
- ("Totals: Rooms...%d Exits...%d Things...%d Players...%d"),
- nrooms, nexits, nthings, nplayers);
+ if (ngarbage)
+ notify_format(player,
+ T
+ ("Totals: Rooms...%d Exits...%d Things...%d Players...%d Garbage...%d"),
+ nrooms, nexits, nthings, nplayers, ngarbage);
+ else
+ notify_format(player,