projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replacing struct gateway with struct forward_spec
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
ac9d491
..
8dcdd95
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-1,4
+1,5
@@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.8 2001/06/05 22:32:01 jongfoster Exp $";
+/* vim:ts=3: */
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.10 2001/06/07 14:51:38 joergs Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@
-36,6
+37,12
@@
const char miscutil_rcs[] = "$Id: miscutil.c,v 1.8 2001/06/05 22:32:01 jongfoste
*
* Revisions :
* $Log: miscutil.c,v $
*
* Revisions :
* $Log: miscutil.c,v $
+ * Revision 1.10 2001/06/07 14:51:38 joergs
+ * make_path() no longer adds '/' if the dir already ends in '/'.
+ *
+ * Revision 1.9 2001/06/07 14:43:17 swa
+ * slight mistake in make_path, unix path style is /.
+ *
* Revision 1.8 2001/06/05 22:32:01 jongfoster
* New function make_path() to splice directory and file names together.
*
* Revision 1.8 2001/06/05 22:32:01 jongfoster
* New function make_path() to splice directory and file names together.
*
@@
-482,14
+489,14
@@
char *strsav(char *old, const char *text_to_append)
*********************************************************************/
int simplematch(char *pattern, char *text)
{
*********************************************************************/
int simplematch(char *pattern, char *text)
{
- char *fallback;
- char *pat = pattern;
- char *txt = text;
- int wildcard = 0;
+
char *fallback;
+
char *pat = pattern;
+
char *txt = text;
+
int wildcard = 0;
- char lastchar = 'a';
- unsigned i;
- unsigned char charmap[32];
+
char lastchar = 'a';
+
unsigned i;
+
unsigned char charmap[32];
while (*txt)
while (*txt)
@@
-634,6
+641,24
@@
char *bindup(const char *string, int n)
*********************************************************************/
char * make_path(const char * dir, const char * file)
{
*********************************************************************/
char * make_path(const char * dir, const char * file)
{
+#ifdef AMIGA
+ char path[512];
+
+ if(dir)
+ {
+ strncpy(path,dir,512);
+ path[511]=0;
+ } else {
+ path[0]=0;
+ }
+ if(AddPart(path,file,512))
+ {
+ return strdup(path);
+ } else {
+ return NULL;
+ }
+#else /* ndef AMIGA */
+
if ((file == NULL) || (*file == '\0'))
{
return NULL; /* Error */
if ((file == NULL) || (*file == '\0'))
{
return NULL; /* Error */
@@
-656,12
+681,13
@@
char * make_path(const char * dir, const char * file)
#ifdef _WIN32
strcat(path, "\\");
#else /* ifndef _WIN32 */
#ifdef _WIN32
strcat(path, "\\");
#else /* ifndef _WIN32 */
- strcat(path, "/");
+
if(path[strlen(path)-1] != '/')
strcat(path, "/");
#endif /* ifndef _WIN32 */
strcat(path, file);
return path;
}
#endif /* ifndef _WIN32 */
strcat(path, file);
return path;
}
+#endif /* ndef AMIGA */
}
}