projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The host parameter to connect_to() is now const.
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
7423af1
..
8b0fc5b
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-1,4
+1,5
@@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 19:12:30 oes Exp $";
+/* vim:ts=3: */
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.9 2001/06/07 14:43:17 swa 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.7 2001/06/03 19:12:30 oes Exp $
*
* Revisions :
* $Log: miscutil.c,v $
*
* Revisions :
* $Log: miscutil.c,v $
+ * 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.7 2001/06/03 19:12:30 oes
* introduced bindup()
*
* Revision 1.7 2001/06/03 19:12:30 oes
* introduced bindup()
*
@@
-631,6
+638,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 */
@@
-653,12
+678,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 */
}
}