diff options
Diffstat (limited to 'libkpgp')
| -rw-r--r-- | libkpgp/kpgpbase.cpp | 63 | ||||
| -rw-r--r-- | libkpgp/kpgpbase2.cpp | 4 |
2 files changed, 54 insertions, 13 deletions
diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index 591a99439..c8efdfa4a 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -76,7 +76,11 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) if(passphrase) { - pipe(ppass); + if (pipe(ppass) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } pass = fdopen(ppass[1], "w"); fwrite(passphrase, sizeof(char), strlen(passphrase), pass); @@ -104,9 +108,21 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) error = ""; output = ""; - pipe(pin); - pipe(pout); - pipe(perr); + if (pipe(pin) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } + if (pipe(pout) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } + if (pipe(perr) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } TQApplication::flushX(); if(!(child_pid = fork())) @@ -241,8 +257,13 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) } } } - else // if input.isEmpty() - write(pin[1], "\n", 1); + else { // if input.isEmpty() + if (write(pin[1], "\n", 1) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } + } //kdDebug(5100) << "All input was written to pin[1]" << endl; } close(pin[1]); @@ -398,7 +419,11 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) if(passphrase) { - pipe(ppass); + if (pipe(ppass) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } pass = fdopen(ppass[1], "w"); fwrite(passphrase, sizeof(char), strlen(passphrase), pass); @@ -418,9 +443,21 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) error = ""; output = ""; - pipe(pin); - pipe(pout); - pipe(perr); + if (pipe(pin) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } + if (pipe(pout) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } + if (pipe(perr) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } if( passphrase ) { if( mVersion >= "1.0.7" ) { @@ -617,7 +654,11 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) } } else { // if input.isEmpty() - write(pin[1], "\n", 1); + if (write(pin[1], "\n", 1) < 0) { + // An error occurred + // FIXME + printf("Something went wrong in libkpgp/kpgpbase.cpp\n"); + } //kdDebug(5100) << "All input was written to pin[1]" << endl; close (pin[1]); pin[1] = -1; diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index fdafa130e..9427edaf0 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -1031,8 +1031,8 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys ) // Example: // Key fingerprint = 47 30 7C 76 05 BF 5E FB 72 41 00 F2 7D 0B D0 49 - int pos2; - pos2 = pos + 18; +// int pos2; +// pos2 = pos + 18; TQCString fingerprint = output.mid( pos, index2-pos ); // remove white space from the fingerprint for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; ) |