Expose no forking mode

Author: ViliusSutkus89

pdf2htmlEX/src/main/cpp/pdf2htmlEX.cc

@@ -83,6 +83,12 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_set_1environment_1value(JN
     setenv(key.c_str(), value.c_str(), 1);
 }
 
+static bool forkBeforeConverting = true;
+JNIEXPORT void JNICALL
+Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_setNoForking(JNIEnv *, jobject) {
+  forkBeforeConverting = false;
+}
+
 extern "C"
 JNIEXPORT jint JNICALL
 Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_call_1pdf2htmlEX(JNIEnv *env, jobject,
@@ -128,16 +134,26 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_call_1pdf2htmlEX(JNIEnv *e
   // Upstream library is actually an executable, not a library.
   // May have some global state, initialized as static constructor, poisoned after first use.
   // Workaround: fork process before use.
-  pid_t pid = fork();
+  pid_t pid = 0;
+  if (forkBeforeConverting) {
+    pid = fork();
+    if (0 < pid) {
+      int waitStatus;
+      waitpid(pid, &waitStatus, 0);
+      if (WIFEXITED(waitStatus)) {
+        retVal = WEXITSTATUS(waitStatus);
+      } else {
+        retVal = 4;
+      }
+    } else if (-1 == pid) {
+      retVal = 3;
+    }
+  }
+
   if (0 == pid) {
     retVal = pdf2htmlEX_main(argc, argv);
-    exit(retVal);
-  }
-  else if (0 < pid) {
-    int wstatus;
-    waitpid(pid, &wstatus, 0);
-    if (WIFEXITED(wstatus)) {
-      retVal = WEXITSTATUS(wstatus);
+    if (forkBeforeConverting) {
+      exit(retVal);
     }
   }
 
@@ -148,3 +164,4 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_call_1pdf2htmlEX(JNIEnv *e
 
   return retVal;
 }
+

pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java

@@ -43,6 +43,8 @@ public final class pdf2htmlEX {
   private String p_ownerPassword = "";
   private String p_userPassword = "";
 
+  private boolean m_noForkingConversionAlreadyDone = false;
+
   public static class ConversionFailedException extends Exception {
     public ConversionFailedException(String errorMessage) {
       super(errorMessage);
@@ -110,7 +112,19 @@ public pdf2htmlEX setUserPassword(@NonNull String userPassword) {
     return this;
   }
 
+  public pdf2htmlEX setNoForking(@NonNull boolean iDoUnderstandThatIWillHaveToRestartTheAppBeforeICanRunConversionForTheSecondTime) throws IllegalArgumentException {
+    if (!iDoUnderstandThatIWillHaveToRestartTheAppBeforeICanRunConversionForTheSecondTime) {
+      throw new IllegalArgumentException();
+    }
+    setNoForking();
+    return this;
+  }
+
   public File convert() throws IOException, ConversionFailedException {
+    if (this.m_noForkingConversionAlreadyDone) {
+      throw new ConversionFailedException("No forking mode allows only one conversion!");
+    }
+
     if (null == this.p_inputPDF) {
       throw new ConversionFailedException("No Input PDF given!");
     }
@@ -135,6 +149,8 @@ public File convert() throws IOException, ConversionFailedException {
       this.p_ownerPassword, this.p_userPassword
       );
 
+    this.m_noForkingConversionAlreadyDone = true;
+
     if (0 != retVal) {
       outputHtml.delete();
       throw new ConversionFailedException("Conversion failed. Return value from pdf2htmlEX: " + retVal.toString());
@@ -148,4 +164,5 @@ public File convert() throws IOException, ConversionFailedException {
   // Because Java cannot setenv for the current process
   static native void set_environment_value(String key, String value);
 
+  private native void setNoForking();
 }