From: Antoine Jacquet <royale@zerezo.com>
Date: Sat, 14 Jan 2006 23:00:00 +0000 (+0100)
Subject: version 0.33
X-Git-Tag: v0.33
X-Git-Url: http://royale.zerezo.com/git/?a=commitdiff_plain;h=bbf33cb4cdfaef9afd70b1355c78121773461f49;p=FAPG

version 0.33

* code cleanup to avoid compilation warnings with gcc 4 (patch by Laurent Coustet)
* remove leading "./" when parsing current directory
* remove double "//" when parsing a directory ending with a "/" (patch by Laurent Coustet)
---

diff --git a/CHANGELOG b/CHANGELOG
index 98fcadf..4acccea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 Change log file for FAPG
 
+version 0.33	(2006-01-15)
+	* code cleanup to avoid compilation warnings with gcc 4 (patch by Laurent Coustet)
+	* remove leading "./" when parsing current directory
+	* remove double "//" when parsing a directory ending with a "/" (patch by Laurent Coustet)
+
 version 0.32	(2005-02-07)
 	* back to a basic Makefile for clean packinging purposes
 
diff --git a/README b/README
index bd41f82..529b653 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-FAPG 0.32 (Fast Audio Playlist Generator)
+FAPG 0.33 (Fast Audio Playlist Generator)
 site: http://royale.zerezo.com/fapg/
 mail: royale@zerezo.com
 
diff --git a/fapg.c b/fapg.c
index 529a26f..b800d76 100644
--- a/fapg.c
+++ b/fapg.c
@@ -1,5 +1,5 @@
 /*
- * FAPG version 0.32
+ * FAPG version 0.33
  *
  * FAPG means Fast Audio Playlist Generator.
  * It is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
@@ -46,24 +46,24 @@
 int debug=0;
 int format=0; /* 0 = m3u ; 1 = pls ; 2 = html */
 char *genrelist=NULL;
-unsigned char *prefix="";
+char *prefix="";
 int recursive=0;
 int avoidhlinked=0;
 int separator='/';
 int skip=0;
 int windows=0;
-unsigned char *eol="\n";
-unsigned char buffer[MAX];
+char *eol="\n";
+char buffer[MAX];
 
 int counter=0;
 
-unsigned char artist[1024];
-unsigned char title[1024];
-unsigned char genrebuf[1024];
-unsigned char genre=0;
+char artist[1024];
+char title[1024];
+char genrebuf[1024];
+char genre=0;
 int duration;
 
-unsigned char unix2dos[256]={0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,70,35,36,37,38,39,40,41,82,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,84,59,36,61,65,71,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,36,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,36,125,126,127,199,252,233,226,228,224,229,231,234,235,232,239,238,236,196,197,201,230,198,244,246,242,251,249,255,214,220,248,163,216,215,131,225,237,243,250,241,209,170,186,191,174,172,189,188,161,171,187,166,166,166,166,166,193,194,192,169,166,166,43,43,162,165,43,43,45,45,43,45,43,227,195,43,43,45,45,166,45,43,164,240,208,202,203,200,105,205,206,207,43,43,166,220,166,204,175,211,223,212,210,245,213,181,254,222,218,219,217,253,221,175,180,173,177,61,190,182,167,247,184,176,168,183,185,179,178,166,160};
+char unix2dos[256]={0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,70,35,36,37,38,39,40,41,82,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,84,59,36,61,65,71,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,36,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,36,125,126,127,199,252,233,226,228,224,229,231,234,235,232,239,238,236,196,197,201,230,198,244,246,242,251,249,255,214,220,248,163,216,215,131,225,237,243,250,241,209,170,186,191,174,172,189,188,161,171,187,166,166,166,166,166,193,194,192,169,166,166,43,43,162,165,43,43,45,45,43,45,43,227,195,43,43,45,45,166,45,43,164,240,208,202,203,200,105,205,206,207,43,43,166,220,166,204,175,211,223,212,210,245,213,181,254,222,218,219,217,253,221,175,180,173,177,61,190,182,167,247,184,176,168,183,185,179,178,166,160};
 
 void usage()
 {
@@ -172,7 +172,7 @@ void parse_options(int argc,char **argv)
   }
 }
 
-void parse_mp3(unsigned char *file)
+void parse_mp3(char *file)
 {
   int bitrates[2][3][15]=
     {{{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448},
@@ -182,7 +182,7 @@ void parse_mp3(unsigned char *file)
       {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160},
       {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160}}};
   FILE *fic;
-  unsigned char *c;
+  char *c;
   int lus;
 
   genre=0;
@@ -266,7 +266,7 @@ void parse_mp3(unsigned char *file)
   
   while (c<buffer+lus-10)
   {
-    if (*c==0xFF && (*(c+1)&0xF0)==0xF0)
+    if ((unsigned char)*c==0xFF && ((unsigned char)*(c+1)&0xF0)==0xF0)
     {
       int version;
       int lay;
@@ -317,10 +317,10 @@ void parse_mp3(unsigned char *file)
   fclose(fic);
 }  
 
-void parse_ogg(unsigned char *file)
+void parse_ogg(char *file)
 {
   FILE *fic;
-  unsigned char *c;
+  char *c;
   int lus;
   int sample_rate;
   int samples;
@@ -392,10 +392,10 @@ void parse_ogg(unsigned char *file)
   fclose(fic);
 }
 
-void parse_mpc(unsigned char *file)
+void parse_mpc(char *file)
 {
   FILE *fic;
-  unsigned char *c;
+  char *c;
   int lus;
   int sample_rates[4]={44100,48000,37800,32000};
   int frame_count;
@@ -542,12 +542,12 @@ int hlink_check(struct stat*info)
   return is_registered;
 }
 
-void parse_directory(unsigned char *path)
+void parse_directory(char *path)
 {
   int i,n;
   struct dirent **namelist;
-  unsigned char newpath[PATH_MAX];
-  unsigned char *c;
+  char newpath[PATH_MAX];
+  char *c;
   struct stat infos;
 
   void print_faketitle()
@@ -557,14 +557,24 @@ void parse_directory(unsigned char *path)
     while (c<newpath+strlen(newpath)-5)
     {
       c++;
-      if (*c=='_') putchar(' '); else if (windows) putchar(unix2dos[*c]); else putchar(*c);
+      if (*c=='_') putchar(' '); else if (windows) putchar(unix2dos[(int)*c]); else putchar(*c);
     }
   }
   
   void print_path()
   {
+    char last=0;
     printf(prefix);
-    for (c=newpath+skip;*c!='\0';c++) if (*c=='/') putchar(separator); else if (windows) putchar(unix2dos[*c]); else putchar(*c);
+    c=newpath+skip;
+    /* remove leading "./" when parsing current directory */
+    if (*c=='.' && *(c+1)=='/') { c+=2; last='/'; }
+    for (;*c!='\0';c++)
+    {
+      /* remove double "//" when parsing a directory ending with a "/" */
+      if (last=='/' && *c=='/') continue;
+      last=*c;
+      if (*c=='/') putchar(separator); else if (windows) putchar(unix2dos[(int)*c]); else putchar(*c);
+    }
   }
 
   if (debug) fprintf(stderr,"Debug >> parsing directory : %s\n",path);
@@ -577,7 +587,7 @@ void parse_directory(unsigned char *path)
     /* hlink_check() might be applied more selective ... avoidhlink is only a simple prereq */
     if (S_ISREG(infos.st_mode) && ! ( avoidhlinked && hlink_check(&infos) ) )
     {
-      unsigned char ext[5];
+      char ext[5];
       int j;
       for (j=0;j<5;j++) ext[j]=tolower(namelist[i]->d_name[strlen(namelist[i]->d_name)-4+j]);
       artist[0]='\0';
@@ -590,7 +600,7 @@ void parse_directory(unsigned char *path)
       if (strcmp(".ogg",ext)==0) { duration=-1; parse_ogg(newpath); }
       if (strcmp(".wav",ext)==0) { duration=-1; /* parse_wav(newpath); */ }
       
-      if (duration!=-2 && genrelist[genre]) /* is it an audio file ? */
+      if (duration!=-2 && genrelist[(int)genre]) /* is it an audio file ? */
       {
         counter++;
         switch (format)
@@ -642,7 +652,7 @@ int main(int argc,char **argv)
       printf("[playlist]%s",eol);
       break;
     case 2:
-      printf("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG 0.32</title>%s<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />%s<style type=\"text/css\">%s<!--%s%sbody,td,tr {%s font-family: Verdana, Arial, Helvetica, sans-serif;%s  font-size: 12px;%s  color: #000000;%s}%s%sbody {%s  background: #ffffff;%s}%s%sth {%s  text-align: center;%s  background: #ffcccc;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #dd8888 solid;%s}%s%std {%s  text-align: center;%s  background: #eeeeee;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #cccccc solid;%s}%s%sh1 {%s  font-size: 25px;%s}%s%sp {%s  font-size: 10px;%s}%s%sa {%s  color: #993333;%s  text-decoration: none;%s}%s%sa:hover {%s text-decoration: underline;%s}%s%s-->%s</style>%s</head>%s%s<body>%s%s<h1>Playlist</h1>%s%s<table>%s<tr><th>Entry</th><th>Artist</th><th>Title</th><th>Length</th></tr>%s",eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol);
+      printf("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG 0.33</title>%s<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />%s<style type=\"text/css\">%s<!--%s%sbody,td,tr {%s font-family: Verdana, Arial, Helvetica, sans-serif;%s  font-size: 12px;%s  color: #000000;%s}%s%sbody {%s  background: #ffffff;%s}%s%sth {%s  text-align: center;%s  background: #ffcccc;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #dd8888 solid;%s}%s%std {%s  text-align: center;%s  background: #eeeeee;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #cccccc solid;%s}%s%sh1 {%s  font-size: 25px;%s}%s%sp {%s  font-size: 10px;%s}%s%sa {%s  color: #993333;%s  text-decoration: none;%s}%s%sa:hover {%s text-decoration: underline;%s}%s%s-->%s</style>%s</head>%s%s<body>%s%s<h1>Playlist</h1>%s%s<table>%s<tr><th>Entry</th><th>Artist</th><th>Title</th><th>Length</th></tr>%s",eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol);
       break;
   }
   for (;optind<argc;optind++)
@@ -656,7 +666,7 @@ int main(int argc,char **argv)
       printf("NumberOfEntries=%d%sVersion=2%s",counter,eol,eol);
       break;
     case 2:
-      printf("</table>%s%s<p>Playlist generated by <a href=\"http://royale.zerezo.com/fapg/\">FAPG 0.32</a></p>%s%s</body>%s%s</html>",eol,eol,eol,eol,eol,eol);
+      printf("</table>%s%s<p>Playlist generated by <a href=\"http://royale.zerezo.com/fapg/\">FAPG 0.33</a></p>%s%s</body>%s%s</html>",eol,eol,eol,eol,eol,eol);
       break;
   }
   if (genrelist) free(genrelist);