Update copyright notice

[empserver] / src / lib / commands / info.c

diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c
index e2bc48222d46d4eedaafbe34679ce13f76112253..d12ba196023aa5143417ccb0e83f681940879966 100644 (file)
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -32,38 +32,33 @@
  *     Mike Wise, 1997 - added apropos and case insensitivity
  *     Doug Hay, 1998
  *     Steve McClure, 1998-2000
+ *     Ron Koenderink, 2004
  */
 
 #include <config.h>
 
+#include <ctype.h>
 #include <errno.h>
-#include <string.h>
-#include <stdio.h>
 #include <sys/stat.h>
-#include <time.h>
+#include <stdio.h>
 #if !defined(_WIN32)
 #include <dirent.h>
 #else
 #include <windows.h>
 #endif
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 #include "optlist.h"
 
-static s_char *
-lowerit(s_char *buf, int n, s_char *orig)
+static char *
+lowerit(char *buf, int n, char *orig)
 {                              /* converts a string to lower case */
     /* lower case output buffer */
     /* size of output buffer */
     /* input strig */
     int i;
-    s_char *tmp;
-    tmp = buf;
-    memset(buf, 0, n);
-    for (i = 0; i < n && *orig; i++) {
-       *tmp++ = tolower(*orig++);
-    }
+    for (i = 0; i < n - 1 && orig[i]; i++)
+       buf[i] = tolower(orig[i]);
+    buf[i] = 0;
     return buf;
 }
 
@@ -72,14 +67,14 @@ lowerit(s_char *buf, int n, s_char *orig)
 int
 info(void)
 {
-    s_char buf[255];
+    char buf[255];
     FILE *fp;
-    s_char *name;
-    s_char *tmp_name;
+    char *name;
+    char *tmp_name;
     struct stat statb;
     struct dirent *dp;
-    s_char filename[1024];
-    s_char last[256];
+    char filename[1024];
+    char last[256];
     DIR *info_dp;
     int nmatch = 0;
     int width = 0;
@@ -171,11 +166,11 @@ int
 apro(void)
 {
     FILE *fp;
-    s_char *name, *lbp;
-    s_char *fbuf;
-    s_char *lbuf;
+    char *name, *lbp;
+    char *fbuf;
+    char *lbuf;
     struct dirent *dp;
-    s_char filename[1024];
+    char filename[1024];
     DIR *info_dp;
     long nf, nhf, nl, nlhl, nhl, nll;
     int alreadyhit;
@@ -216,8 +211,10 @@ apro(void)
      */
     nf = nhf = nl = nhl = 0;
     while ((dp = readdir(info_dp)) != 0) {
+       if (dp->d_name[0] == '.')
+           continue;
        snprintf(filename, sizeof(filename), "%s/%s", infodir,
-           dp->d_name);
+                dp->d_name);
        fp = fopen(filename, "r");
        alreadyhit = 0;
        nll = nlhl = 0;
@@ -276,17 +273,17 @@ apro(void)
     return RET_OK;
 }
 
-#else
+#else  /* _WIN32 */
 
 int
 info(void)
 {
-    s_char buf[255];
+    char buf[255];
     FILE *fp;
-    s_char *name;
-    s_char *tmp_name;
-    s_char filename[1024];
-    s_char last[256];
+    char *name;
+    char *tmp_name;
+    char filename[1024];
+    char last[256];
     int nmatch = 0;
     int width = 0;
     char sep;
@@ -306,7 +303,7 @@ info(void)
     if (!name || !*name)
        name = "TOP";
 
-    _snprintf(filename, sizeof(filename) - 1, "%s\\%s", infodir, name);
+    snprintf(filename, sizeof(filename) - 1, "%s\\%s", infodir, name);
     fp = fopen(filename, "rb");
     if (fp == NULL) {
        /* may be a "partial" request.  */
@@ -339,7 +336,7 @@ info(void)
                (strncasecmp(name, fData.cFileName, strlen(name)) == 0)) {
                nmatch++;
                if (nmatch == 1) {
-                   _snprintf(last, sizeof(last), "%s", fData.cFileName);
+                   snprintf(last, sizeof(last), "%s", fData.cFileName);
                } else {
                    if (nmatch == 2) {
                        pr("`%s' is ambiguous.  The following topics match:\n%s",
@@ -364,7 +361,7 @@ info(void)
            pr(".\n");
            return RET_FAIL;
        }
-       _snprintf(filename, sizeof(filename), "%s/%s",
+       snprintf(filename, sizeof(filename), "%s/%s",
                  infodir, last);
        fp = fopen(filename, "rb");
        if (fp == NULL) {
@@ -401,10 +398,10 @@ apro(void)
     HANDLE hDir;
     WIN32_FIND_DATA fData;
     FILE *fp;
-    s_char *name, *lbp;
-    s_char *fbuf;
-    s_char *lbuf;
-    s_char filename[1024];
+    char *name, *lbp;
+    char *fbuf;
+    char *lbuf;
+    char filename[1024];
     long nf, nhf, nl, nlhl, nhl, nll;
     int alreadyhit;
     int lhitlim;
@@ -421,7 +418,7 @@ apro(void)
            lhitlim = 100;
     }
 
-    _snprintf(filename, sizeof(filename), "%s\\*",infodir);
+    snprintf(filename, sizeof(filename), "%s\\*",infodir);
     hDir = FindFirstFile(filename, &fData);
     if (hDir == INVALID_HANDLE_VALUE) {
        if (GetLastError() == ERROR_PATH_NOT_FOUND) {
@@ -454,7 +451,7 @@ apro(void)
            ((fData.dwFileAttributes == FILE_ATTRIBUTE_NORMAL) ||
             (fData.dwFileAttributes == FILE_ATTRIBUTE_ARCHIVE) ||
             (fData.dwFileAttributes == FILE_ATTRIBUTE_READONLY))) {
-           _snprintf(filename, sizeof(filename), "%s\\%s", infodir,
+           snprintf(filename, sizeof(filename), "%s\\%s", infodir,
                      fData.cFileName);
            fp = fopen(filename, "rb");
            alreadyhit = 0;
@@ -503,4 +500,4 @@ apro(void)
     return RET_OK;
 }
 
-#endif
+#endif /* _WIN32 */