unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
blob 278ae912c7608f36f1d0082e1e559fc5a547f0b2 936 bytes (raw)
name: gnu/packages/patches/classpath-instruction-order.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 
diff -ruN ../classpath/classpath-0.93/native/jni/java-io/java_io_VMFile.c ./native/jni/java-io/java_io_VMFile.c
--- ../classpath/classpath-0.93/native/jni/java-io/java_io_VMFile.c	2006-09-23 08:17:45.000000000 +0300
+++ ./native/jni/java-io/java_io_VMFile.c	2021-09-03 01:08:17.073644627 +0300
@@ -278,6 +278,7 @@
   const char *filename;
   int result;
   jint entryType;
+  int fres;
 
   /* Don't use the JCL convert function because it throws an exception
      on failure */
@@ -288,9 +289,22 @@
     }
 
   result = cpio_checkType (filename, &entryType);
+
+  fres = 1;
+
+  if (result != CPNATIVE_OK)
+    {
+      fres = 0;
+    }
+
+  if (entryType != CPFILE_FILE)
+    {
+      fres = 0;
+    }
+
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0;
+  return fres;
 #else /* not WITHOUT_FILESYSTEM */
   return 0;
 #endif /* not WITHOUT_FILESYSTEM */

debug log:

solving 278ae912c7 ...
found 278ae912c7 in https://yhetil.org/guix-bugs/20210902222749.28633-1-mail@muradm.net/

applying [1/1] https://yhetil.org/guix-bugs/20210902222749.28633-1-mail@muradm.net/
diff --git a/gnu/packages/patches/classpath-instruction-order.patch b/gnu/packages/patches/classpath-instruction-order.patch
new file mode 100644
index 0000000000..278ae912c7

1:15: trailing whitespace.
 
1:20: trailing whitespace.
 
1:36: trailing whitespace.
 
Checking patch gnu/packages/patches/classpath-instruction-order.patch...
Applied patch gnu/packages/patches/classpath-instruction-order.patch cleanly.
warning: 3 lines add whitespace errors.

index at:
100644 278ae912c7608f36f1d0082e1e559fc5a547f0b2	gnu/packages/patches/classpath-instruction-order.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).