--------------Boundary-00=_EUP0OIJK8M8XKHLLPPU8 Content-Type: text/plain Content-Transfer-Encoding: 8bit Hiya, konsole and some other programs suffer from the problem that a command line like: konsole -e mutt -s "bla bla" Doesn't really work because "-s" is parsed as a non-existing konsole option. The current work around is to type: konsole -e mutt -- -s "bla bla" The "--" indicates that all following arguments should not be treated as konsole options. The following patch allows programs like konsole to specify that all arguments following a certain option should be treated as arguments instead of options. Effectively this means that: konsole -e mutt -s "bla bla" will now work as expected. Attached you find a patch that add support for the '!' modifier to indicate that an option is the last option and a patch for konsole to make use of this. Cheers, Waldo -- KDE/Linux, made for people, made by people. --------------Boundary-00=_EUP0OIJK8M8XKHLLPPU8 Content-Type: text/x-c++; name="kcmdlineargs.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kcmdlineargs.diff" SW5kZXg6IGtjbWRsaW5lYXJncy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tk ZWxpYnMva2RlY29yZS9rY21kbGluZWFyZ3MuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQz CmRpZmYgLXUgLXIxLjQzIGtjbWRsaW5lYXJncy5jcHAKLS0tIGtjbWRsaW5lYXJncy5jcHAJMjAw MC8wOC8wOCAxOTo0Njo0MwkxLjQzCisrKyBrY21kbGluZWFyZ3MuY3BwCTIwMDAvMDgvMjggMTk6 NDg6MjQKQEAgLTMzMCwxNyArMzMwLDI0IEBACiAgKiAgMiAtIGludmVyc2Ugb3B0aW9uIGZvdW5k ICgnbm8nKQkvLyAtbm9mb3JrCiAgKiAgMyAtIG9wdGlvbiArIGFyZyBmb3VuZAkJLy8gLWZvcmsg bm93CiAgKgorICogICs0IC0gbm8gbW9yZSBvcHRpb25zIGZvbGxvdyAgICAgICAgIC8vICFmb3Jr CiAgKi8KIHN0YXRpYyBpbnQKIGZpbmRPcHRpb24oY29uc3QgS0NtZExpbmVPcHRpb25zICpvcHRp b25zLCBRQ1N0cmluZyAmb3B0LAogICAgICAgICAgICBjb25zdCBjaGFyIComb3B0X25hbWUsIGNv bnN0IGNoYXIgKiZkZWYsIGJvb2wgJmVuYWJsZWQpCiB7CisgICBpbnQgcmVzdWx0ID0gMDsKICAg IGJvb2wgaW52ZXJzZTsKICAgIGludCBsZW4gPSBvcHQubGVuZ3RoKCk7CiAgICB3aGlsZShvcHRp b25zICYmIG9wdGlvbnMtPm5hbWUpCiAgICB7CiAgICAgICBpbnZlcnNlID0gZmFsc2U7CiAgICAg ICBvcHRfbmFtZSA9IG9wdGlvbnMtPm5hbWU7CisgICAgICBpZiAob3B0X25hbWVbMF0gPT0gJyEn KQorICAgICAgeworICAgICAgICAgb3B0X25hbWUrKzsKKyAgICAgICAgIHJlc3VsdCA9IDQ7Cisg ICAgICB9CiAgICAgICBpZiAoKG9wdF9uYW1lWzBdID09ICduJykgJiYgKG9wdF9uYW1lWzFdID09 ICdvJykpCiAgICAgICB7CiAgICAgICAgICBvcHRfbmFtZSArPSAyOwpAQCAtMzUyLDEzICszNTks MTMgQEAKICAgICAgICAgIGlmICghb3B0X25hbWVbMF0pCiAgICAgICAgICB7CiAgICAgICAgICAg ICBpZiAoaW52ZXJzZSkKLSAgICAgICAgICAgICAgIHJldHVybiAyOworICAgICAgICAgICAgICAg cmV0dXJuIHJlc3VsdCsyOwogCiAgICAgICAgICAgICBpZiAoIW9wdGlvbnMtPmRlc2NyaXB0aW9u KQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgb3B0aW9ucysrOwogICAgICAgICAgICAg ICAgaWYgKCFvcHRpb25zLT5uYW1lKQotICAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0KzA7CiAgICAgICAgICAgICAgICBRQ1N0cmluZyBu ZXh0T3B0aW9uID0gb3B0aW9ucy0+bmFtZTsKICAgICAgICAgICAgICAgIGludCBwID0gbmV4dE9w dGlvbi5maW5kKCcgJyk7CiAgICAgICAgICAgICAgICBpZiAocCA+IDApCkBAIC0zNjgsNyArMzc1 LDcgQEAKICAgICAgICAgICAgICAgICAgIG5leHRPcHRpb24gPSBuZXh0T3B0aW9uLm1pZCgyKTsK ICAgICAgICAgICAgICAgICAgIGVuYWJsZWQgPSAhZW5hYmxlZDsKICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgIGludCByZXN1bHQgPSBmaW5kT3B0aW9uKG9wdGlvbnMsIG5leHRPcHRp b24sIG9wdF9uYW1lLCBkZWYsIGVuYWJsZWQpOworICAgICAgICAgICAgICAgcmVzdWx0ID0gZmlu ZE9wdGlvbihvcHRpb25zLCBuZXh0T3B0aW9uLCBvcHRfbmFtZSwgZGVmLCBlbmFibGVkKTsKICAg ICAgICAgICAgICAgIGFzc2VydChyZXN1bHQpOwogICAgICAgICAgICAgICAgb3B0ID0gbmV4dE9w dGlvbjsKICAgICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CkBAIC0zODAsNyArMzg3LDcgQEAK ICAgICAgICAgIHsKICAgICAgICAgICAgIG9wdF9uYW1lKys7CiAgICAgICAgICAgICBkZWYgPSBv cHRpb25zLT5kZWY7Ci0gICAgICAgICAgICByZXR1cm4gMzsKKyAgICAgICAgICAgIHJldHVybiBy ZXN1bHQrMzsKICAgICAgICAgIH0KICAgICAgIH0KIApAQCAtMzkxLDcgKzM5OCw3IEBACiAKIAog dm9pZAotS0NtZExpbmVBcmdzOjpmaW5kT3B0aW9uKGNvbnN0IGNoYXIgKl9vcHQsIFFDU3RyaW5n IG9wdCwgaW50ICZpLCBib29sIF9lbmFibGVkKQorS0NtZExpbmVBcmdzOjpmaW5kT3B0aW9uKGNv bnN0IGNoYXIgKl9vcHQsIFFDU3RyaW5nIG9wdCwgaW50ICZpLCBib29sIF9lbmFibGVkLCBib29s ICZtb3JlT3B0aW9ucykKIHsKICAgIEtDbWRMaW5lQXJncyAqYXJncyA9IGFyZ3NMaXN0LT5maXJz dCgpOwogICAgY29uc3QgY2hhciAqb3B0X25hbWU7CkBAIC00MTUsNiArNDIyLDEyIEBACiAgICAg ICB1c2FnZSggaTE4bigiVW5rbm93biBvcHRpb24gJyUxJy4iKS5hcmcoX29wdCkpOwogICAgfQog CisgICBpZiAoKHJlc3VsdCAmIDQpICE9IDApCisgICB7CisgICAgICByZXN1bHQgJj0gfjQ7Cisg ICAgICBtb3JlT3B0aW9ucyA9IGZhbHNlOworICAgfQorCiAgICBpZiAocmVzdWx0ID09IDMpIC8v IFRoaXMgb3B0aW9uIHRha2VzIGFuIGFyZ3VtZW50CiAgICB7CiAgICAgICBpZiAoIWVuYWJsZWQp CkBAIC01MjQsNyArNTM3LDcgQEAKICAgICAgICAgICAgICAgb3B0aW9uICs9IDI7CiAgICAgICAg ICAgICAgIGVuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgICAgfQotICAgICAgICAgICBmaW5kT3B0 aW9uKG9yaWcsIG9wdGlvbiwgaSwgZW5hYmxlZCk7CisgICAgICAgICAgIGZpbmRPcHRpb24ob3Jp Zywgb3B0aW9uLCBpLCBlbmFibGVkLCBpbk9wdGlvbnMpOwogICAgICAgICAgfQogICAgICAgfQog ICAgICAgZWxzZQpAQCAtNzY2LDYgKzc3OSw5IEBACiAgICAgICAgICAgICAgICBoYXNPcHRpb25z ID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgaWYgKG5hbWVbMF0gPT0gJyEn KQorICAgICAgICAgICAgICAgbmFtZSA9IG5hbWUubWlkKDEpOworCiAgICAgICAgICAgICBpZiAo KG5hbWUubGVuZ3RoKCkgPT0gMSkgfHwgKG5hbWVbMV0gPT0gJyAnKSkKICAgICAgICAgICAgICAg IG5hbWUgPSAiLSIrbmFtZTsKICAgICAgICAgICAgIGVsc2UKQEAgLTk1NCw3ICs5NzAsNyBAQAog ICAgY29uc3QgY2hhciAqZGVmOwogICAgYm9vbCBkdW1teSA9IHRydWU7CiAgICBRQ1N0cmluZyBv cHQgPSBfb3B0OwotICAgaW50IHJlc3VsdCA9IDo6ZmluZE9wdGlvbiggb3B0aW9ucywgb3B0LCBv cHRfbmFtZSwgZGVmLCBkdW1teSk7CisgICBpbnQgcmVzdWx0ID0gOjpmaW5kT3B0aW9uKCBvcHRp b25zLCBvcHQsIG9wdF9uYW1lLCBkZWYsIGR1bW15KSAmIH40OwogCiAgICBpZiAocmVzdWx0ICE9 IDMpCiAgICB7CkBAIC0xMDA3LDcgKzEwMjMsNyBAQAogICAgY29uc3QgY2hhciAqZGVmOwogICAg Ym9vbCBkdW1teSA9IHRydWU7CiAgICBRQ1N0cmluZyBvcHQgPSBfb3B0OwotICAgaW50IHJlc3Vs dCA9IDo6ZmluZE9wdGlvbiggb3B0aW9ucywgb3B0LCBvcHRfbmFtZSwgZGVmLCBkdW1teSk7Cisg ICBpbnQgcmVzdWx0ID0gOjpmaW5kT3B0aW9uKCBvcHRpb25zLCBvcHQsIG9wdF9uYW1lLCBkZWYs IGR1bW15KSAmIH40OwogCiAgICBpZiAocmVzdWx0ID09IDApCiAgICB7CkluZGV4OiBrY21kbGlu ZWFyZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbGlicy9rZGVjb3JlL2tj bWRsaW5lYXJncy5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjI5CmRpZmYgLXUgLXIxLjI5IGtj bWRsaW5lYXJncy5oCi0tLSBrY21kbGluZWFyZ3MuaAkyMDAwLzA4LzI0IDEyOjQ0OjQ4CTEuMjkK KysrIGtjbWRsaW5lYXJncy5oCTIwMDAvMDgvMjggMTk6NDg6MjcKQEAgLTQ0Nyw3ICs0NDcsNyBA QAogICAgKgogICAgKiBDaGVja3Mgd2hhdCB0byBkbyB3aXRoIGEgc2luZ2xlIG9wdGlvbgogICAg Ki8KLSAgc3RhdGljIHZvaWQgZmluZE9wdGlvbihjb25zdCBjaGFyICpfb3B0LCBRQ1N0cmluZyBv cHQsIGludCAmaSwgYm9vbCBlbmFibGVkKTsKKyAgc3RhdGljIHZvaWQgZmluZE9wdGlvbihjb25z dCBjaGFyICpfb3B0LCBRQ1N0cmluZyBvcHQsIGludCAmaSwgYm9vbCBlbmFibGVkLCBib29sICZt b3JlT3B0aW9ucyk7CiAKICAgLyoqCiAgICAqIEBpbnRlcm5hbAo= --------------Boundary-00=_EUP0OIJK8M8XKHLLPPU8 Content-Type: text/english; name="konsole.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="konsole.diff" SW5kZXg6IG1haW4uQwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlYmFzZS9rb25z b2xlL3NyYy9tYWluLkMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTUxCmRpZmYgLXUgLXIxLjE1 MSBtYWluLkMKLS0tIG1haW4uQwkyMDAwLzA3LzI5IDAxOjQ4OjA5CTEuMTUxCisrKyBtYWluLkMJ MjAwMC8wOC8yOCAxOTo0OTozMgpAQCAtMzUsOSArMzUsOCBAQAogICAgeyAieHdpbiIsICAgICAg ICAgICAgSTE4Tl9OT09QKCJpZ25vcmVkIiksIDAgfSwJCiAgICB7ICJub2hpc3QiLCAgICAgICAg ICBJMThOX05PT1AoIkRvIG5vdCBzYXZlIGxpbmVzIGluIHNjcm9sbC1iYWNrIGJ1ZmZlciIpLCAw IH0sCiAgICB7ICJ2dF9zeiBDQ3hMTCIsICBJMThOX05PT1AoIlRlcm1pbmFsIHNpemUgaW4gY29s dW1ucyB4IGxpbmVzIiksIDAgfSwKLSAgIHsgImUgPGNvbW1hbmQ+IiwgIEkxOE5fTk9PUCgiRXhl Y3V0ZSAnY29tbWFuZCcgaW5zdGVhZCBvZiBzaGVsbCIpLCAwIH0sCi0vL0ZJWE1FOiBXQUJBOiBX ZSBuZWVkIGEgd2F5IHRvIHNheSB0aGF0IGFsbCBvcHRpb25zIGFmdGVyIC1lCi0gICAvLyBzaG91 bGQgYmUgdHJlYXRlZCBhcyBhcmd1bWVudHMuCisgICB7ICIhZSA8Y29tbWFuZD4iLCAgSTE4Tl9O T09QKCJFeGVjdXRlICdjb21tYW5kJyBpbnN0ZWFkIG9mIHNoZWxsIiksIDAgfSwKKyAgIC8vIFdB QkE6IEFsbCBvcHRpb25zIGFmdGVyIC1lIGFyZSB0cmVhdGVkIGFzIGFyZ3VtZW50cy4KICAgIHsg IitbYXJnc10iLCAgCUkxOE5fTk9PUCgiQXJndW1lbnRzIGZvciAnY29tbWFuZCciKSwgMCB9LAog ICAgeyAwLCAwLCAwIH0KIH07Cg== --------------Boundary-00=_EUP0OIJK8M8XKHLLPPU8--