tests: ensure that strace can detach from sleeping and stopped processes

[strace] / loop.c

diff --git a/loop.c b/loop.c
index a350135491d7d7be52c9469549cc44602b78569c..a3f89e06f79d8f899774ba539f46510b50e5def5 100644 (file)
--- a/loop.c
+++ b/loop.c
@@ -33,8 +33,10 @@
 
 static const struct xlat loop_flags_options[] = {
        { LO_FLAGS_READ_ONLY,   "LO_FLAGS_READ_ONLY"    },
+#if HAVE_DECL_LO_FLAGS_AUTOCLEAR
        { LO_FLAGS_AUTOCLEAR,   "LO_FLAGS_AUTOCLEAR"    },
-#ifdef LO_FLAGS_PARTSCAN
+#endif
+#if HAVE_DECL_LO_FLAGS_PARTSCAN
        { LO_FLAGS_PARTSCAN,    "LO_FLAGS_PARTSCAN"     },
 #endif
        { 0,                    NULL                    },
@@ -70,7 +72,7 @@ int loop_ioctl(struct tcb *tcp, long code, long arg)
                if (!verbose(tcp) || umove(tcp, arg, &info) < 0)
                        return 0;
 
-               tprintf(", {number=%i", info.lo_number);
+               tprintf(", {number=%d", info.lo_number);
 
                if (!abbrev(tcp)) {
                        tprintf(", device=%#lx, inode=%lu, rdevice=%#lx",
@@ -85,7 +87,7 @@ int loop_ioctl(struct tcb *tcp, long code, long arg)
                        tprints(", encrypt_type=");
                        printxval(loop_crypt_type_options, info.lo_encrypt_type,
                                "LO_CRYPT_???");
-                       tprintf(", encrypt_key_size=%i", info.lo_encrypt_key_size);
+                       tprintf(", encrypt_key_size=%d", info.lo_encrypt_key_size);
                }
 
                tprints(", flags=");
@@ -164,7 +166,9 @@ int loop_ioctl(struct tcb *tcp, long code, long arg)
                return 1;
 
        case LOOP_CLR_FD:
+#ifdef LOOP_SET_CAPACITY
        case LOOP_SET_CAPACITY:
+#endif
 #ifdef LOOP_CTL_GET_FREE
        /* newer loop-control stuff */
        case LOOP_CTL_GET_FREE: