SOURCES: mpc123-fixes.patch - updated for 0.2.4

qboosh qboosh at pld-linux.org
Sun Aug 24 08:13:14 CEST 2008


Author: qboosh                       Date: Sun Aug 24 06:13:14 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.2.4

---- Files affected:
SOURCES:
   mpc123-fixes.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mpc123-fixes.patch
diff -u SOURCES/mpc123-fixes.patch:1.1 SOURCES/mpc123-fixes.patch:1.2
--- SOURCES/mpc123-fixes.patch:1.1	Wed Mar 19 22:41:59 2008
+++ SOURCES/mpc123-fixes.patch	Sun Aug 24 08:13:08 2008
@@ -1,5 +1,5 @@
---- mpc123-0.2.3/playlist.c.orig	2008-03-18 20:01:18.000000000 +0100
-+++ mpc123-0.2.3/playlist.c	2008-03-19 22:24:05.593830685 +0100
+--- mpc123-0.2.4/playlist.c.orig	2008-03-21 22:49:57.000000000 +0100
++++ mpc123-0.2.4/playlist.c	2008-08-24 08:06:22.842121739 +0200
 @@ -53,8 +53,7 @@ int populate_playlist_from_file(playlist
  
      /* allocate and strcpy each element */
@@ -10,15 +10,7 @@
      debugf(" \"%s\"", pl->files[i]);
      i++;
    }
-@@ -75,7 +74,6 @@ int populate_playlist_from_file(playlist
- int populate_playlist_from_argv(playlist_t * pl, char ** argv,
-                                 int optind, int n){
-   int i=0;
--  int sl=0;
- 
-   debugf("before black magic: argv[0]=\"%s\", optind=%d, n=%d",
-         argv[0], optind, n);
-@@ -85,7 +83,7 @@ int populate_playlist_from_argv(playlist
+@@ -85,7 +84,7 @@ int populate_playlist_from_argv(playlist
          argv[0], optind, n);
  
    /* allocate main array (n elements + NULL) */
@@ -27,17 +19,6 @@
  
    /* scramble playlist */
    if(options.shuffle && !options.random){
-@@ -95,9 +93,7 @@ int populate_playlist_from_argv(playlist
-   /* otherwise just allocate and strcpy each element */
-     for(i=0; i<n; i++){
-       debugf("element \"%s\" ", argv[i]);
--      sl=strlen(argv[i]);
--      pl->files[i]=(char*)malloc(sl+1);
--      strncpy(pl->files[i], argv[i], sl);
-+      pl->files[i] = strdup(argv[i]);
-       debugf("        \"%s\"", pl->files[i]);
-     }
-   }
 --- mpc123-0.2.3/shuffle.c.orig	2008-03-18 20:01:18.000000000 +0100
 +++ mpc123-0.2.3/shuffle.c	2008-03-19 22:22:44.529211076 +0100
 @@ -31,7 +31,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mpc123-fixes.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list