diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-05-21 19:31:41 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-05-21 19:31:41 +0000 |
| commit | 3e59977b2736dbe9a3c801882ec4f03a43af07b5 (patch) | |
| tree | a03a1bf17406a22bf1ec5f3ba20c3390f280e9e5 /src/htsname.c | |
| parent | 5fd71d61fcdad419f5cd7cb19acd200b4c483b2c (diff) | |
DOS 8+3 fixes.
Diffstat (limited to 'src/htsname.c')
| -rw-r--r-- | src/htsname.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/htsname.c b/src/htsname.c index c608de6..3bc8a21 100644 --- a/src/htsname.c +++ b/src/htsname.c @@ -1046,11 +1046,11 @@ int url_savename(char *adr_complete, char *fil_complete, char *save, } else { // noms 8-3 if (strlen(final_adr) > 4) { if (strfield(final_adr, "www.")) - strncatbuff(save, final_adr + 4, max_char); + hts_appendStringUTF8(save, final_adr + 4, max_char); else - strncatbuff(save, final_adr, max_char); + hts_appendStringUTF8(save, final_adr, max_char); } else - strncatbuff(save, final_adr, max_char); + hts_appendStringUTF8(save, final_adr, max_char); } /* release */ @@ -1092,12 +1092,12 @@ int url_savename(char *adr_complete, char *fil_complete, char *save, } else { // noms 8-3 if (strlen(final_adr) > 4) { if (strfield(final_adr, "www.")) - strncatbuff(save, final_adr + 4, max_char); + hts_appendStringUTF8(save, final_adr + 4, max_char); else - strncatbuff(save, final_adr, max_char); + hts_appendStringUTF8(save, final_adr, max_char); strcatbuff(save, "/"); } else { - strncatbuff(save, final_adr, max_char); + hts_appendStringUTF8(save, final_adr, max_char); strcatbuff(save, "/"); } } @@ -1281,16 +1281,15 @@ int url_savename(char *adr_complete, char *fil_complete, char *save, } // { // éliminer les // (comme ftp://) - char *a; + size_t i; - //while( (a=strstr(save,"//")) ) *a='_'; cleanDoubleSlash(save); - // Eliminer chars spéciaux - a = save - 1; - while(*(++a)) - if (((unsigned char) (*a) <= 31) - || ((unsigned char) (*a) == 127)) - *a = '_'; + + for(i = 0 ; save[i] != '\0' ; i++) { + unsigned char c = (unsigned char) save[i]; + if (c < 32 || c == 127) + save[i] = '_'; + } } #if HTS_OVERRIDE_DOS_FOLDERS |