[xiph-cvs] cvs commit: icecast/src admin.c config.c connection.c

[Ed]

oddsock     03/05/15 19:19:57

  Modified:    src      admin.c config.c connection.c
  Log:
  some win32-isms
  and a bad free that valgrind yelled at me about

Revision  Changes    Path
1.10      +3 -0      icecast/src/admin.c

Index: admin.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/admin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- admin.c	15 May 2003 21:03:32 -0000	1.9
+++ admin.c	15 May 2003 23:19:57 -0000	1.10
@@ -20,6 +20,9 @@
 #include "format_mp3.h"
 
 #include "logging.h"
+#ifdef _WIN32
+#define snprintf _snprintf
+#endif
 
 #define CATMODULE "admin"
 

<p><p>1.35      +1 -1      icecast/src/config.c

Index: config.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/config.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- config.c	15 May 2003 21:03:32 -0000	1.34
+++ config.c	15 May 2003 23:19:57 -0000	1.35
@@ -644,7 +644,7 @@
             if(configuration->webroot_dir[strlen(configuration->webroot_dir)-1] == '/')
                 configuration->webroot_dir[strlen(configuration->webroot_dir)-1] = 0;
         } else if (strcmp(node->name, "adminroot") == 0) {
-            if (configuration->adminroot_dir && configuration->adminroot_dir != CONFIG_DEFAULT_WEBROOT_DIR) 
+            if (configuration->adminroot_dir && configuration->adminroot_dir != CONFIG_DEFAULT_ADMINROOT_DIR) 
                 xmlFree(configuration->adminroot_dir);
             configuration->adminroot_dir = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
             if(configuration->adminroot_dir[strlen(configuration->adminroot_dir)-1] == '/')

<p><p>1.70      +4 -0      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- connection.c	23 Apr 2003 12:44:29 -0000	1.69
+++ connection.c	15 May 2003 23:19:57 -0000	1.70
@@ -726,7 +726,11 @@
         return;
     }
     else if(fileserve && stat(fullpath, &statbuf) == 0 && 
+#ifdef _WIN32
+            (statbuf.st_mode == S_IFREG))
+#else
             S_ISREG(statbuf.st_mode)) 
+#endif
     {
         fserve_client_create(client, fullpath);
         free(fullpath);

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.