/*
- * $Id$
- *
* Server-side utility functions
- *
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <ctype.h>
#include <stdio.h>
#include <string.h>
+#include <sys/stat.h>
+#include <libcitadel.h>
+
#include "citadel.h"
-#include "server.h"
#include "support.h"
-
/*
* strproc() - make a string 'nice'
*/
void strproc(char *string)
{
- int a;
+ int a, b;
if (string == NULL) return;
- if (strlen(string)==0) 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]);
- }
-
}
+}
+
/*
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 (!strncasecmp(&search[a],patn,strlen(patn))) return(a);
- }
- return(-1);
- }
/*
int a;
char buf[SIZ];
struct stat test;
- FILE *ls;
for (a=0; a<numdirs; ++a) {
snprintf(buf, sizeof buf, "%s/%s", dirs[a], searchfor);
if (!stat(buf, &test)) {
- snprintf(targ,n,"%s/%s", dirs[a], searchfor);
+ snprintf(targ, n, "%s/%s", dirs[a], searchfor);
return;
}
}