Changeset 15e6f2c9d099fac8307a8e40055886e2f11de1d5

Timestamp:

06/01/08 19:16:56 (3 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1212340616 +0200

git-parent:

[53c74579305052334468d130a3f4bfcfc3757209]

git-author:

Rafaël Carré <funman@videolan.org> 1212323427 +0200

Message:

Binary updates: support arbitrarily long descriptions

Note that an upper limit should be set anyway

Files:

• src/misc/update.c (modified) (7 diffs)

src/misc/update.c

@@ -68 +68 @@
- *      * AKA "0.8.6d" or "0.9.0"
- * Second line is an url of the binary for this last version
-Third line is a description of the update (it MAY be extended to several lines, but for now it is only one line)
+Remaining text is a required description of the update
- */
-
@@ -1105 +1105 @@
-    int i_revision = 0;
-    unsigned char extra;
-    char *psz_line = NULL;
-    char *psz_version_line = NULL;
-
@@ -1116 +1115 @@
-    }
-
-Try to read three lines
-
+Start reading the status file
+version_
-    {
-        msg_Err( p_update->p_libvlc, "Update file %s is corrupted : missing version",
@@ -1124 +1123 @@
-    }
-
-    psz_version_line = psz_line;
-    /* first line : version number */
-    p_update->release.extra = 0;
-
+
+
-    {
-        case 4:
@@ -1141 +1140 @@
-    }
-
-S
-sz_line
+s
+_update->release.psz_url
-    {
-        msg_Err( p_update->p_libvlc, "Update file %s is corrupted : URL missing",
@@ -1148 +1147 @@
-        goto error;
-    }
-
-
-
-/* Third line : description */
-if( !( psz_line = stream_ReadLine( p_stream ) ) )
-{
-msg_Err( p_update->p_libvlc, "Update file %s is corrupted 
- 
+
+
+
+if( i_read <= 0 )
+{
+    msg_Err( p_update->p_libvlc,
+        "Update file %s is corrupted
+
-        goto error;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    stream_Delete( p_stream );
@@ -1245 +1255 @@
-        gcry_md_putc( hd, '\r' );
-    gcry_md_putc( hd, '\n' );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( sign.version == 3 )