diff -Nur webCDwriter-2.6.5/CDWserver/Config.cpp webCDwriter-2.6.5c/CDWserver/Config.cpp --- webCDwriter-2.6.5/CDWserver/Config.cpp 2004-02-11 12:15:13.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/Config.cpp 2004-02-17 15:55:14.000000000 +0100 @@ -93,7 +93,7 @@ dev = tokenizer.nextToken(); media = tokenizer.nextToken(); driver = tokenizer.nextToken(); - if (media.equals("cdrom") && driver.equals("ide-cd")) { + if (media.equals("cdrom") && driver.startsWith("ide-cd")) { numOfIdeCdDevices++; File f = new File(dev); if (kernelBoot.length() > 0) @@ -111,8 +111,10 @@ p.addArg("-scanbus"); p.start(); cdrecordScanbus2(p); + bool cdrecordError = p.getResult() != 0; if (numOfIdeCdDevices > 0) { + cdrecordError = false; int i = numOfWriters; Process p2(getCdrecordPath()); p2.addArg(S.e + "dev=" + ATAPI); @@ -136,7 +138,8 @@ dev = tokenizer.nextToken(); media = tokenizer.nextToken(); driver = tokenizer.nextToken(); - if (media.equals("cdrom") && driver.equals("ide-cd")) { + if (media.equals("cdrom") + && driver.startsWith("ide-cd")) { writers[i].dev = dev; writers[i].rawDevice = dev; i++; @@ -177,7 +180,7 @@ log.put(2, S.e + "writers = " + numOfWriters); - if (p.getResult() != 0 || numOfWriters == 0) { + if (cdrecordError || numOfWriters == 0) { String str; if (kernelBoot.length() == 0) str = str + "Install a CD- or DVD-writer or try the " @@ -186,7 +189,7 @@ else str = str + "Add \"" + kernelBoot + "\" to your kernel boot parameters!"; - if (p.getResult() != 0) + if (cdrecordError) throw new Exception(S.e + "Error running \"cdrecord -scanbus\"", S.e + str); else @@ -1089,8 +1092,8 @@ try { for (int i = 0; i < numOfItems; i++) - log.put(5, S.e + "<" + items[i]->key - + "> <" + items[i]->active.toString() + ">"); + log.put(5, S.e + "\"" + items[i]->key + + "\" \"" + items[i]->active.toString() + "\""); } catch (Exception *e) { log.put(2, S.e + e->getMessage()); diff -Nur webCDwriter-2.6.5/CDWserver/http/config/support.html webCDwriter-2.6.5c/CDWserver/http/config/support.html --- webCDwriter-2.6.5/CDWserver/http/config/support.html 2003-12-20 15:08:10.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/http/config/support.html 2004-02-16 19:58:38.000000000 +0100 @@ -30,6 +30,9 @@

Description of the problem (English or German)

+ + + diff -Nur webCDwriter-2.6.5/CDWserver/http/header webCDwriter-2.6.5c/CDWserver/http/header --- webCDwriter-2.6.5/CDWserver/http/header 2003-12-17 17:21:50.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/http/header 2004-02-17 12:56:09.000000000 +0100 @@ -27,7 +27,7 @@ CDWserver
-  Status +  Status (Auto)
 Config diff -Nur webCDwriter-2.6.5/CDWserver/HTTPServer.cpp webCDwriter-2.6.5c/CDWserver/HTTPServer.cpp --- webCDwriter-2.6.5/CDWserver/HTTPServer.cpp 2004-02-11 12:04:57.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/HTTPServer.cpp 2004-02-16 20:59:57.000000000 +0100 @@ -127,7 +127,10 @@ File file = new File(config.getHttpDir(), "/webCDcreator/4pluginRSA/webCDcreator.jar"); String str = "/webCDcreator/4pluginRSA/version-"; - str = str + Version.version; + String ver = Version.version; + if (ver.length() == 3 + 2 + 1) + ver = ver.substring(0, 3 + 2); + str = str + ver; File version = new File(config.getHttpDir(), str); if (!file.exists() || !version.exists()) request.uri = "/webCDcreator/4pluginRSA/info.html"; @@ -198,23 +201,24 @@ try { String str = new String(sb); config.updateEditor(str); - String passwdKey = PASSWORD; - String password = config.getEditorValue(passwdKey); - if (request.uri.equals("/config/support.html")) { + isAdmin = true; + if (request.uri.indexOf("/config/") >= 0 + && request.uri.indexOf("/support.html") >= 0) config.resetWarning(); - isAdmin = true; - } else { + String passwdKey = PASSWORD; + String password = config.getEditorValue(passwdKey); Server::activateConfig(); config.setEditor(PASSWORD, password); } } catch (Exception *e) { - log.put(5, S.e + e->toString()); - if (e->toString().indexOf("Invalid password") >= 0 - && request.uri.equals("/config/support.html")) + log.put(5, S.e + + "HTTPServer::run(): " + e->toString()); + if (request.uri.indexOf("/support.html") >= 0) { request.uri = "/support.html"; isConfig = true; + } delete e; } diff -Nur webCDwriter-2.6.5/CDWserver/Process.cpp webCDwriter-2.6.5c/CDWserver/Process.cpp --- webCDwriter-2.6.5/CDWserver/Process.cpp 2004-02-06 00:00:24.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/Process.cpp 2004-02-16 12:42:20.000000000 +0100 @@ -228,9 +228,10 @@ } void Process::show() { - log.putv("Process: <%s>", args[0]); + log.put(4, S.e + "Process: \"" + args[0] + "\""); for (int i = 1; i < argsNum; i++) - log.putv("%8d: <%s>", i, args[i]); + log.put(4, S.e + " " + (i < 10? " ": "") + i + + ": \"" + args[i] + "\""); } /** diff -Nur webCDwriter-2.6.5/CDWserver/Server.cpp webCDwriter-2.6.5c/CDWserver/Server.cpp --- webCDwriter-2.6.5/CDWserver/Server.cpp 2004-02-11 19:03:06.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/Server.cpp 2004-02-16 12:16:51.000000000 +0100 @@ -1938,8 +1938,10 @@ writers[i].thread = getpid(); writers[i].reservedUntil = 0; writers[i].state = reserved; - if (ID < 0) + if (ID < 0) { readerNo = i; + writers[i].thread = -getpid(); + } } } diff -Nur webCDwriter-2.6.5/CDWserver/Version.h webCDwriter-2.6.5c/CDWserver/Version.h --- webCDwriter-2.6.5/CDWserver/Version.h 2004-02-12 14:12:11.000000000 +0100 +++ webCDwriter-2.6.5c/CDWserver/Version.h 2004-02-20 20:20:44.000000000 +0100 @@ -31,7 +31,7 @@ projectHome[] = "http://JoergHaeger.de/webCDwriter/", soxHome[] = "http://sox.sourceforge.net", subTitle[] = "Network CD Writing", - version[] = "2.6.5"; + version[] = "2.6.5c"; class Version { public: diff -Nur webCDwriter-2.6.5/ChangeLog webCDwriter-2.6.5c/ChangeLog --- webCDwriter-2.6.5/ChangeLog 2004-02-10 17:45:51.000000000 +0100 +++ webCDwriter-2.6.5c/ChangeLog 2004-02-12 14:23:09.000000000 +0100 @@ -31,6 +31,11 @@ - use all available writers to burn several copies of a project +webCDcreator + +- local "Save project as..." and "Open project..." + + rcdrecord - copies=# option to burn several copies of a project Binary files webCDwriter-2.6.5/MD5Verify/MD5Verify.jar and webCDwriter-2.6.5c/MD5Verify/MD5Verify.jar differ diff -Nur webCDwriter-2.6.5/rcdrecord/Version.h webCDwriter-2.6.5c/rcdrecord/Version.h --- webCDwriter-2.6.5/rcdrecord/Version.h 2004-02-12 14:12:11.000000000 +0100 +++ webCDwriter-2.6.5c/rcdrecord/Version.h 2004-02-20 20:20:44.000000000 +0100 @@ -7,4 +7,4 @@ projectHome[] = "http://wwwhomes.uni-bielefeld.de/" "jhaeger/webCDwriter/", subTitle[] = "Network CD Writing", - version[] = "2.6.5"; + version[] = "2.6.5c"; Binary files webCDwriter-2.6.5/webCDcreator/4plugin/webCDcreator.jar and webCDwriter-2.6.5c/webCDcreator/4plugin/webCDcreator.jar differ diff -Nur webCDwriter-2.6.5/webCDcreator/Version.java webCDwriter-2.6.5c/webCDcreator/Version.java --- webCDwriter-2.6.5/webCDcreator/Version.java 2004-02-12 14:12:11.000000000 +0100 +++ webCDwriter-2.6.5c/webCDcreator/Version.java 2004-02-20 20:20:44.000000000 +0100 @@ -17,7 +17,7 @@ product = "webCDcreator", projectHome = "http://JoergHaeger.de/webCDwriter/", subTitle = "Network CD/DVD Writing", - version = "2.6.5"; + version = "2.6.5c"; /** * tags: bytesPerSecond, cellEditor, getURL(), ls -l, diff -Nur webCDwriter-2.6.5/webCDwriter.spec webCDwriter-2.6.5c/webCDwriter.spec --- webCDwriter-2.6.5/webCDwriter.spec 2004-02-12 14:12:11.000000000 +0100 +++ webCDwriter-2.6.5c/webCDwriter.spec 2004-02-20 20:20:44.000000000 +0100 @@ -3,7 +3,7 @@ # %define name webCDwriter -%define version 2.6.5 +%define version 2.6.5c %define release 1 %if %(test -e /etc/mandrake-release && echo 1 || echo 0)