--- fapg.c 2015-02-02 13:27:58.000000000 -0500 +++ fapg.c 2015-02-03 09:47:00.000000000 -0500 @@ -57,27 +57,27 @@ int debug = 0; int format = FORMAT_M3U; -char *genrelist = NULL; -unsigned char *prefix = ""; -unsigned char *base = ""; -unsigned char *dir = ""; -unsigned char *hostname = "fritzserver.de"; +static char *genrelist = NULL; +static char *prefix = ""; +static char *base = ""; +static char *dir = ""; +static const char *hostname = "fritzserver.de"; // unsigned char *referal="/usr/local/bin/fapg-rss.sh"; -unsigned char *referal = NULL; +static const char *referal = NULL; //int windows=0; int fromstdin = 0; int recursive = 0; int avoidhlinked = 0; int separator = '/'; -unsigned char *eol = "\n"; -unsigned char buffer[MAX]; +static const char *eol = "\n"; +static char buffer[MAX]; int counter = 0; -unsigned char artist[1024]; -unsigned char title[1024]; -unsigned char genrebuf[1024]; -unsigned char genre = 0; +static char artist[1024]; +static char title[1024]; +static char genrebuf[1024]; +static unsigned char genre = 0; int duration; #define MP2ENC 1 #define MP3ENC 2 @@ -87,7 +87,7 @@ #define WAVENC 6 #define WMAENC 7 -char *magic[] = { NULL, +static const char *magic[] = { NULL, "audio/mpeg", "audio/mpeg", "audio/mpeg", "audio/mpeg", "audio/ogg-vorbis", "audio/x-wav", @@ -95,7 +95,7 @@ NULL }; -unsigned char unix2dos[] = +static unsigned char unix2dos[] = { 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, @@ -126,7 +126,7 @@ unsigned char *basemap; unsigned char *winorunix; -unsigned char one2one[] = +static unsigned char one2one[] = { 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, @@ -160,7 +160,7 @@ 248, 249, 250, 251, 252, 253, 254, 255 }; /* identical mapping */ -unsigned char noand[256] = +static unsigned char noand[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, @@ -194,7 +194,7 @@ 248, 249, 250, 251, 252, 253, 254, 255 }; /* only '&' is mapped to '+' */ -unsigned char *iso2web[256] = { +static const char *iso2web[256] = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", @@ -308,7 +308,7 @@ int pos = 0; int cnt = 0; char b; - unsigned char *prefx; + char *prefx; prefx = prefix; @@ -344,7 +344,7 @@ { int cnt = 0; int pos; - unsigned char *prefx; + char *prefx; txxputnameoffset(c); @@ -669,7 +669,7 @@ } } -void parse_mp3(unsigned char *file) +void parse_mp3(const char *file) { int bitrates[2][3][15] = { {{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, @@ -683,7 +683,7 @@ {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; @@ -773,7 +773,7 @@ } while(c < buffer + lus - 10) { - if(*c == 0xFF && (*(c + 1) & 0xF0) == 0xF0) { + if((unsigned char)*c == 0xFF && (*(c + 1) & 0xF0) == 0xF0) { int version; int lay; int bitrate_index; @@ -823,10 +823,10 @@ fclose(fic); } -void parse_ogg(unsigned char *file) +void parse_ogg(const char *file) { FILE *fic; - unsigned char *c; + char *c; int lus; int sample_rate; int samples; @@ -911,10 +911,10 @@ fclose(fic); } -void parse_mpc(unsigned char *file) +void parse_mpc(const char *file) { FILE *fic; - unsigned char *c; + char *c; int lus; int sample_rates[4] = { 44100, 48000, 37800, 32000 }; int frame_count; @@ -1253,9 +1253,9 @@ } #endif -void parse_file(unsigned char *newpath, unsigned char * original_path) +void parse_file(char *newpath, const char * original_path) { - unsigned char ext[5]; + char ext[5]; int j, encoding = 0; for(j = 0; j < 5; j++) @@ -1457,11 +1457,11 @@ } } -void parse_directory(unsigned char *path, unsigned char * original_path) +void parse_directory(char *path, const char * original_path) { int i, n; struct dirent **namelist; - unsigned char newpath[PATH_MAX]; + char newpath[PATH_MAX]; struct stat infos; if(debug) @@ -1520,8 +1520,7 @@ break; case FORMAT_HTML: printf - ("%s%s%s%s
%sEntry | Artist | Title | Length |
---|
Playlist generated by FAPG " - VERSION "
%s%s%s%s", eol, eol, eol, eol, + "0.42%s%s%s%s", eol, eol, eol, eol, eol, eol); break; case FORMAT_RSS: