Changeset 1167 for 1.8.3/trunk/src/bsd.c

Timestamp:

12/28/07 19:57:17 (1 year ago)

Author:

shawnw

Message:

Merge devel into trunk for p6 release

Files:

• 1.8.3/trunk/src/bsd.c (modified) (17 diffs)

1.8.3/trunk/src/bsd.c

@@ -113 +113 @@
-#include "strtree.h"
-#include "log.h"
-
+my
-#ifdef HAS_OPENSSL
-#include "myssl.h"
@@ -160 +160 @@
-static int under_limit = 1;
-
-;  
-;  
-;  
-;  
-
-;  
-;  
+ = { '\0' };
+ = { '\0' };
+ = { '\0' };
+ = { '\0' };
+ = { '\0' }
+ = { '\0' };
+ = { '\0' };
-
-/** Is this descriptor connected to a telnet-compatible terminal? */
@@ -469 +469 @@
-    if (child < 0) {
-      /* Print a warning and continue */
-
+nn_pe
-    } else if (child > 0) {
-      /* Parent process of a successful fork() */
@@ -476 +476 @@
-      /* Child process */
-      if (new_process_session() < 0)
-
+nn_pe
-    }
-  }
@@ -1011 +1011 @@
-#endif
-      {
-
+nn_pe
-        return;
-      }
@@ -1117 +1117 @@
-#endif
-  {
-
+nn_pe
-    return -1;
-  }
@@ -1588 +1588 @@
-    if (input_ready < 0) {
-      /* Well, shoot, we have no idea. Guess and proceed. */
-
+nn_pe
-      input_ready = 0;
-    }
@@ -2101 +2101 @@
-{
-  if (*userstring) {
- 
+
-    *userstring = NULL;
-  }
@@ -2289 +2289 @@
-    if (!options.login_allow) {
-      fcache_dump(d, fcache.down_fcache, NULL);
-cf_downmotd_msg && 
+
-        raw_notify(player, cf_downmotd_msg);
-    } else if (MAX_LOGINS && !under_limit) {
-      fcache_dump(d, fcache.full_fcache, NULL);
-cf_fullmotd_msg && 
+
-        raw_notify(player, cf_fullmotd_msg);
-    }
@@ -2606 +2606 @@
-#endif
-    if (shutdown(d->descriptor, 2) < 0)
-
+nn_pe
-    closesocket(d->descriptor);
-  }
@@ -3172 +3172 @@
-  orator = player;
-
-cf_motd_msg && 
+
-    raw_notify(player, cf_motd_msg);
-  }
-  raw_notify(player, " ");
-cf_wizmotd_msg && 
-cf_motd_msg && 
+
+
-      raw_notify(player, asterisk_line);
-    raw_notify(player, cf_wizmotd_msg);
@@ -3395 +3395 @@
-do_motd(dbref player, enum motd_type key, const char *message)
-{
-
-
+
+
+
-    notify(player,
-           T
@@ -3402 +3403 @@
-    return;
-  }
+
+  if (!message || !*message)
+    what = T("cleared");
+  else
+    what = T("set");
+
-  switch (key) {
-  case MOTD_MOTD:
-strcpy(cf_motd_msg, message
-(player, T("Motd set.")
+mush_strncpy(cf_motd_msg, message, BUFFER_LEN
+_format(player, T("Motd %s."), what
-    break;
-  case MOTD_WIZ:
-strcpy(cf_wizmotd_msg, message
-(player, T("Wizard motd set.")
+mush_strncpy(cf_wizmotd_msg, message, BUFFER_LEN
+_format(player, T("Wizard motd %s."), what
-    break;
-  case MOTD_DOWN:
-strcpy(cf_downmotd_msg, message
-(player, T("Down motd set.")
+mush_strncpy(cf_downmotd_msg, message, BUFFER_LEN
+_format(player, T("Down motd %s."), what
-    break;
-  case MOTD_FULL:
-strcpy(cf_fullmotd_msg, message
-(player, T("Full motd set.")
+mush_strncpy(cf_fullmotd_msg, message, BUFFER_LEN
+_format(player, T("Full motd %s."), what
-    break;
-  case MOTD_LIST:
-"MOTD: %s"
+T("MOTD: %s")
-    if (Hasprivs(player)) {
-      notify_format(player, T("Wiz MOTD: %s"), cf_wizmotd_msg);
@@ -4044 +4051 @@
-  if (!*args[0])
-    safe_str(T("#-1 FUNCTION REQUIRES ONE ARGUMENT"), buff, bp);
-
+ && match->width > 0
-    safe_integer(match->width, buff, bp);
-  else if (args[1])
@@ -4057 +4064 @@
-  if (!*args[0])
-    safe_str(T("#-1 FUNCTION REQUIRES ONE ARGUMENT"), buff, bp);
-
+ && match->height > 0
-    safe_integer(match->height, buff, bp);
-  else if (args[1])
@@ -4122 +4129 @@
-  DESC *d;
-  int first = 1;
+  dbref victim;
+  int powered = 1;
-
-  if (!Priv_Who(executor)) {
@@ -4128 +4137 @@
-  }
-
+  if (nargs && args[0] && *args[0]) {
+    /* An argument was given. Find the victim and adjust perms */
+    if ((victim = noisy_match_result(executor, args[0], NOTYPE,
+                                     MAT_EVERYTHING)) == NOTHING) {
+      safe_str(T(e_notvis), buff, bp);
+      return;
+    }
+    if (!Priv_Who(victim))
+      powered = 0;
+  }
+
-  DESC_ITER_CONN(d) {
-
-
-
-
-
+
+
+
+
+
+
+
-  }
-}