Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-03 09:29:34 +02:00
Code Issues Projects Releases Wiki Activity

2019-12-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdimport(1) that caused non-Latin1 characters
	to be corrupted when using standard input.
This commit is contained in:
Fred Gleason 2019-12-16 12:59:44 -05:00
parent d7c0578df3
commit 2b3b733c0e
3 changed files with 21 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19355,3 +19355,6 @@
2019-12-16 Fred Gleason <fredg@paravelsystems.com> 2019-12-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdimport(1) that caused UTF-8 multibyte characters * Fixed a bug in rdimport(1) that caused UTF-8 multibyte characters
in filenames to be corrupted. in filenames to be corrupted.
2019-12-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdimport(1) that caused non-Latin1 characters
to be corrupted when using standard input.

76
utils/rdimport/rdimport.cpp
View File

@ -750,7 +750,16 @@ MainObject::MainObject(QObject *parent)
import_fadeup_marker->dump(); import_fadeup_marker->dump();
Log(LOG_INFO,QString(" Files to process:\n")); Log(LOG_INFO,QString(" Files to process:\n"));
for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) { for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) {
Log(LOG_INFO,QString().sprintf(" \"%s\"\n",(const char *)rda->cmdSwitch()->key(i).toUtf8())); if(rda->cmdSwitch()->key(i)=="-") {
if(!import_stdin_specified) {
Log(LOG_INFO," [stdin]\n");
import_stdin_specified=true;
}
}
else {
Log(LOG_INFO,QString().sprintf(" \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i).toUtf8()));
}
} }
// //
@ -787,52 +796,14 @@ void MainObject::userData()
} }
else { else {
for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) { for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) {
ProcessFileList(rda->cmdSwitch()->key(i)); ProcessFileEntry(rda->cmdSwitch()->key(i));
} }
if(import_stdin_specified) { if(import_stdin_specified) {
bool quote_mode=false; QTextStream in_stream(stdin,QIODevice::ReadOnly);
bool escape_mode=false; QString line=in_stream.readLine();
char buffer[PATH_MAX]; while(!line.isNull()) {
unsigned ptr=0; ProcessFileEntry(line);
while((ptr<PATH_MAX)&&(read(0,buffer+ptr,1)==1)) { line=in_stream.readLine();
if(quote_mode) {
if(buffer[ptr]=='\"') {
quote_mode=false;
}
else {
ptr++;
}
}
else {
if(escape_mode) {
ptr++;
escape_mode=false;
}
else {
if(buffer[ptr]=='\"') {
quote_mode=true;
}
else {
if(buffer[ptr]=='\\') {
escape_mode=true;
}
else {
if(isspace(buffer[ptr])) {
buffer[ptr]=0;
ProcessFileList(buffer);
ptr=0;
}
else {
ptr++;
}
}
}
}
}
}
if(ptr>0) {
buffer[ptr]=0;
ProcessFileList(buffer);
} }
} }
} }
@ -873,7 +844,7 @@ void MainObject::RunDropBox()
// Scan for Eligible Imports // Scan for Eligible Imports
// //
for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) { for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) {
ProcessFileList(rda->cmdSwitch()->key(i)); ProcessFileEntry(rda->cmdSwitch()->key(i));
} }
// //
@ -895,17 +866,6 @@ void MainObject::RunDropBox()
} }
void MainObject::ProcessFileList(const QString &flist)
{
QString entry;
for(int i=0;i<flist.length();i++) {
entry+=flist.at(i);
}
ProcessFileEntry(entry);
}
void MainObject::ProcessFileEntry(const QString &entry) void MainObject::ProcessFileEntry(const QString &entry)
{ {
glob_t globbuf; glob_t globbuf;
@ -917,7 +877,7 @@ void MainObject::ProcessFileEntry(const QString &entry)
} }
globbuf.gl_offs=RDIMPORT_GLOB_SIZE; globbuf.gl_offs=RDIMPORT_GLOB_SIZE;
while((globbuf.gl_pathc==RDIMPORT_GLOB_SIZE)||(gflags==GLOB_MARK)) { while((globbuf.gl_pathc==RDIMPORT_GLOB_SIZE)||(gflags==GLOB_MARK)) {
glob(RDEscapeString(entry),gflags,NULL,&globbuf); glob(RDEscapeString(entry.toUtf8()),gflags,NULL,&globbuf);
if((globbuf.gl_pathc==0)&&(gflags==GLOB_MARK)&&(!import_drop_box)) { if((globbuf.gl_pathc==0)&&(gflags==GLOB_MARK)&&(!import_drop_box)) {
Log(LOG_WARNING,QString().sprintf(" Unable to open \"%s\", skipping...\n", Log(LOG_WARNING,QString().sprintf(" Unable to open \"%s\", skipping...\n",
(const char *)entry)); (const char *)entry));

1
utils/rdimport/rdimport.h
View File

@ -57,7 +57,6 @@ class MainObject : public QObject
private: private:
enum Result {Success=0,FileBad=1,NoCart=2,NoCut=3}; enum Result {Success=0,FileBad=1,NoCart=2,NoCut=3};
void RunDropBox(); void RunDropBox();
void ProcessFileList(const QString &flist);
void ProcessFileEntry(const QString &entry); void ProcessFileEntry(const QString &entry);
MainObject::Result ImportFile(const QString &filename,unsigned *cartnum); MainObject::Result ImportFile(const QString &filename,unsigned *cartnum);
void VerifyFile(const QString &filename,unsigned *cartnum); void VerifyFile(const QString &filename,unsigned *cartnum);