-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <pthread.h>
-#include "citadel.h"
-#include "server.h"
-#include "proto.h"
-
/*
- * struncmp() - case-insensitive version of strncmp()
- * citadel.h will #define a strucmp() based on this
+ * Server-side utility functions
*/
-int struncmp(char *lstr, char *rstr, int len)
-{
- int pos = 0;
- char lc,rc;
- while (pos<len) {
- lc=tolower(lstr[pos]);
- rc=tolower(rstr[pos]);
- if ((lc==0)&&(rc==0)) return(0);
- if (lc<rc) return(-1);
- if (lc>rc) return(1);
- pos=pos+1;
- }
- return(0);
- }
+#include "sysdep.h"
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <libcitadel.h>
+
+#include "citadel.h"
+#include "support.h"
/*
* strproc() - make a string 'nice'
*/
void strproc(char *string)
{
- int a;
+ int a, b;
- if (strlen(string)==0) return;
+ if (string == NULL) return;
+ if (IsEmptyStr(string)) return;
/* Convert non-printable characters to blanks */
- for (a=0; a<strlen(string); ++a) {
+ for (a=0; !IsEmptyStr(&string[a]); ++a) {
if (string[a]<32) string[a]=32;
if (string[a]>126) string[a]=32;
- }
+ }
+ /* a is now the length of our string. */
/* Remove leading and trailing blanks */
- while( (string[0]<33) && (strlen(string)>0) )
- strcpy(string,&string[1]);
- while( (string[strlen(string)-1]<33) && (strlen(string)>0) )
- string[strlen(string)-1]=0;
+ while( (string[a-1]<33) && (!IsEmptyStr(string)) )
+ string[--a]=0;
+ b = 0;
+ while( (string[b]<33) && (!IsEmptyStr(&string[b])) )
+ b++;
+ if (b > 0)
+ memmove(string,&string[b], a - b + 1);
/* Remove double blanks */
- for (a=0; a<strlen(string); ++a) {
+ for (a=0; !IsEmptyStr(&string[a]); ++a) {
if ((string[a]==32)&&(string[a+1]==32)) {
strcpy(&string[a],&string[a+1]);
a=0;
- }
}
+ }
/* remove characters which would interfere with the network */
- for (a=0; a<strlen(string); ++a) {
+ for (a=0; !IsEmptyStr(&string[a]); ++a) {
while (string[a]=='!') strcpy(&string[a],&string[a+1]);
while (string[a]=='@') strcpy(&string[a],&string[a+1]);
while (string[a]=='_') strcpy(&string[a],&string[a+1]);
while (string[a]==',') strcpy(&string[a],&string[a+1]);
while (string[a]=='%') strcpy(&string[a],&string[a+1]);
while (string[a]=='|') strcpy(&string[a],&string[a+1]);
- }
-
}
-
-
-/*
- * num_parms() - discover number of parameters...
- */
-int num_parms(char *source)
-{
- int a;
- int count = 1;
-
- for (a=0; a<strlen(source); ++a)
- if (source[a]=='|') ++count;
- return(count);
- }
-
-/*
- * extract() - extract a parameter from a series of "|" separated...
- */
-void extract(char *dest, char *source, int parmnum)
-{
- char buf[256];
- int count = 0;
- int n;
-
- if (strlen(source)==0) {
- strcpy(dest,"");
- return;
- }
-
- n = num_parms(source);
-
- if (parmnum >= n) {
- strcpy(dest,"");
- return;
- }
- strcpy(buf,source);
- if ( (parmnum == 0) && (n == 1) ) {
- strcpy(dest,buf);
- for (n=0; n<strlen(dest); ++n)
- if (dest[n]=='|') dest[n] = 0;
- return;
- }
-
- while (count++ < parmnum) do {
- strcpy(buf,&buf[1]);
- } while( (strlen(buf)>0) && (buf[0]!='|') );
- if (buf[0]=='|') strcpy(buf,&buf[1]);
- for (count = 0; count<strlen(buf); ++count)
- if (buf[count] == '|') buf[count] = 0;
- strcpy(dest,buf);
- }
-
-/*
- * extract_int() - extract an int parm w/o supplying a buffer
- */
-int extract_int(char *source, int parmnum)
-{
- char buf[256];
-
- extract(buf,source,parmnum);
- return(atoi(buf));
- }
-
-/*
- * extract_long() - extract an long parm w/o supplying a buffer
- */
-long extract_long(char *source, long int parmnum)
-{
- char buf[256];
-
- extract(buf,source,parmnum);
- return(atol(buf));
- }
+}
string[a-1]=0;
} while(string[0]=='#');
return(strlen(string));
- }
+}
-/*
- * pattern2() - searches for patn within search string, returns pos
- */
-int pattern2(char *search, char *patn)
-{
- int a;
- for (a=0; a<strlen(search); ++a) {
- if (!struncmp(&search[a],patn,strlen(patn))) return(a);
- }
- return(-1);
- }
/*
* mesg_locate() - locate a message or help file, case insensitive
*/
-void mesg_locate(char *targ, char *searchfor, int numdirs, char **dirs)
+void mesg_locate(char *targ, size_t n, const char *searchfor,
+ int numdirs, const char * const *dirs)
{
int a;
- char buf[256];
- FILE *ls;
+ char buf[SIZ];
+ struct stat test;
for (a=0; a<numdirs; ++a) {
- sprintf(buf,"cd %s; exec ls",dirs[a]);
- ls = (FILE *) popen(buf,"r");
- if (ls != NULL) {
- while(fgets(buf,255,ls)!=NULL) {
- while (isspace(buf[strlen(buf)-1]))
- buf[strlen(buf)-1] = 0;
- if (!strucmp(buf,searchfor)) {
- pclose(ls);
- sprintf(targ,"%s/%s",dirs[a],buf);
- return;
- }
- }
- pclose(ls);
- }
+ snprintf(buf, sizeof buf, "%s/%s", dirs[a], searchfor);
+ if (!stat(buf, &test)) {
+ snprintf(targ, n, "%s/%s", dirs[a], searchfor);
+ return;
}
- strcpy(targ,"");
}
+ strcpy(targ,"");
+}
-#ifdef NO_STRERROR
+#ifndef HAVE_STRERROR
/*
* replacement strerror() for systems that don't have it
*/
-char *strerror(e)
-int e; {
+char *strerror(int e)
+{
static char buf[32];
- sprintf(buf,"errno = %d",e);
+ snprintf(buf,sizeof buf,"errno = %d",e);
return(buf);
}
#endif
projects / citadel.git / blobdiff