[xiph-commits] r10617 - icecast/trunk/icecast/src

[msmith at svn.xiph.org]

Author: msmith
Date: 2005-12-17 04:27:29 -0800 (Sat, 17 Dec 2005)
New Revision: 10617

Modified:
   icecast/trunk/icecast/src/format_vorbis.c
   icecast/trunk/icecast/src/main.c
   icecast/trunk/icecast/src/slave.c
Log:
Patch from gtgbr at gmx.net to make ICECAST_VERSION_STRING safe to contain any
content.


Modified: icecast/trunk/icecast/src/format_vorbis.c
===================================================================
--- icecast/trunk/icecast/src/format_vorbis.c	2005-12-17 12:23:54 UTC (rev 10616)
+++ icecast/trunk/icecast/src/format_vorbis.c	2005-12-17 12:27:29 UTC (rev 10617)
@@ -331,7 +331,7 @@
             vorbis_comment_add_tag (&vc, "artist", ogg_info->artist);
         if (ogg_info->title)
             vorbis_comment_add_tag (&vc, "title", ogg_info->title);
-        vorbis_comment_add (&vc, "server=" ICECAST_VERSION_STRING);
+        vorbis_comment_add_tag (&vc, "server", ICECAST_VERSION_STRING);
         vorbis_commentheader_out (&vc, &header);
 
         ogg_stream_packetin (&source_vorbis->new_os, &header);

Modified: icecast/trunk/icecast/src/main.c
===================================================================
--- icecast/trunk/icecast/src/main.c	2005-12-17 12:23:54 UTC (rev 10616)
+++ icecast/trunk/icecast/src/main.c	2005-12-17 12:27:29 UTC (rev 10617)
@@ -77,7 +77,7 @@
 
 static void _print_usage(void)
 {
-    printf(ICECAST_VERSION_STRING "\n\n");
+    printf("%s\n\n", ICECAST_VERSION_STRING);
     printf("usage: icecast [-b -v] -c <file>\n");
     printf("options:\n");
     printf("\t-c <file>\tSpecify configuration file\n");
@@ -518,7 +518,7 @@
         return 1;
     }
 
-    INFO0 (ICECAST_VERSION_STRING " server started");
+    INFO1 ("%s server started", ICECAST_VERSION_STRING);
 
     /* REM 3D Graphics */
 

Modified: icecast/trunk/icecast/src/slave.c
===================================================================
--- icecast/trunk/icecast/src/slave.c	2005-12-17 12:23:54 UTC (rev 10616)
+++ icecast/trunk/icecast/src/slave.c	2005-12-17 12:27:29 UTC (rev 10617)
@@ -209,11 +209,12 @@
          * we don't send in this header then relay will not have mp3 metadata.
          */
         sock_write(streamsock, "GET %s HTTP/1.0\r\n"
-                "User-Agent: " ICECAST_VERSION_STRING "\r\n"
+                "User-Agent: %s\r\n"
                 "%s"
                 "%s"
                 "\r\n",
                 relay->mount,
+                ICECAST_VERSION_STRING,
                 relay->mp3metadata?"Icy-MetaData: 1\r\n":"",
                 auth_header);
         free (auth_header);