]> granicus.if.org Git - strace/commitdiff
2007-08-03 Ulrich Drepper <drepper@redhat.com>
authorRoland McGrath <roland@redhat.com>
Tue, 7 Aug 2007 01:00:26 +0000 (01:00 +0000)
committerRoland McGrath <roland@redhat.com>
Tue, 7 Aug 2007 01:00:26 +0000 (01:00 +0000)
* file.c (open_mode_flags): Add O_CLOEXEC.
* net.c (msg_flags): Add MSG_CMSG_CLOEXEC.

file.c
net.c

diff --git a/file.c b/file.c
index 5eb67657693768d43c2afa22eff7b3692802f8b3..22a8260ce70e9cfd4f5b3733cc0a18441cf8e79e 100644 (file)
--- a/file.c
+++ b/file.c
@@ -269,6 +269,9 @@ const struct xlat open_mode_flags[] = {
 #ifdef O_NOATIME
        { O_NOATIME,    "O_NOATIME"     },
 #endif
+#ifdef O_CLOEXEC
+       { O_CLOEXEC,    "O_CLOEXEC"     },
+#endif
 
 #ifdef FNDELAY
        { FNDELAY,      "FNDELAY"       },
diff --git a/net.c b/net.c
index 5c276eacc87218ead85c2f051876c893e865d930..0085acbea669cfe20a11e0b4eff814d243211111 100644 (file)
--- a/net.c
+++ b/net.c
@@ -437,59 +437,62 @@ static const struct xlat protocols[] = {
        { 0,            NULL            },
 };
 static const struct xlat msg_flags[] = {
-       { MSG_OOB,      "MSG_OOB"       },
+       { MSG_OOB,              "MSG_OOB"               },
 #ifdef MSG_DONTROUTE
-       { MSG_DONTROUTE,"MSG_DONTROUTE" },
+       { MSG_DONTROUTE,        "MSG_DONTROUTE"         },
 #endif
 #ifdef MSG_PEEK
-       { MSG_PEEK,     "MSG_PEEK"      },
+       { MSG_PEEK,             "MSG_PEEK"              },
 #endif
 #ifdef MSG_CTRUNC
-       { MSG_CTRUNC,   "MSG_CTRUNC"    },
+       { MSG_CTRUNC,           "MSG_CTRUNC"            },
 #endif
 #ifdef MSG_PROXY
-       { MSG_PROXY,    "MSG_PROXY"     },
+       { MSG_PROXY,            "MSG_PROXY"             },
 #endif
 #ifdef MSG_EOR
-       { MSG_EOR,      "MSG_EOR"       },
+       { MSG_EOR,              "MSG_EOR"               },
 #endif
 #ifdef MSG_WAITALL
-       { MSG_WAITALL,  "MSG_WAITALL"   },
+       { MSG_WAITALL,          "MSG_WAITALL"           },
 #endif
 #ifdef MSG_TRUNC
-       { MSG_TRUNC,    "MSG_TRUNC"     },
+       { MSG_TRUNC,            "MSG_TRUNC"             },
 #endif
 #ifdef MSG_CTRUNC
-       { MSG_CTRUNC,   "MSG_CTRUNC"    },
+       { MSG_CTRUNC,           "MSG_CTRUNC"            },
 #endif
 #ifdef MSG_ERRQUEUE
-       { MSG_ERRQUEUE, "MSG_ERRQUEUE"  },
+       { MSG_ERRQUEUE,         "MSG_ERRQUEUE"          },
 #endif
 #ifdef MSG_DONTWAIT
-       { MSG_DONTWAIT, "MSG_DONTWAIT"  },
+       { MSG_DONTWAIT,         "MSG_DONTWAIT"          },
 #endif
 #ifdef MSG_CONFIRM
-       { MSG_CONFIRM,  "MSG_CONFIRM"   },
+       { MSG_CONFIRM,          "MSG_CONFIRM"           },
 #endif
 #ifdef MSG_PROBE
-       { MSG_PROBE,    "MSG_PROBE"     },
+       { MSG_PROBE,            "MSG_PROBE"             },
 #endif
 #ifdef MSG_FIN
-       { MSG_FIN,      "MSG_FIN"       },
+       { MSG_FIN,              "MSG_FIN"               },
 #endif
 #ifdef MSG_SYN
-       { MSG_SYN,      "MSG_SYN"       },
+       { MSG_SYN,              "MSG_SYN"               },
 #endif
 #ifdef MSG_RST
-       { MSG_RST,      "MSG_RST"       },
+       { MSG_RST,              "MSG_RST"               },
 #endif
 #ifdef MSG_NOSIGNAL
-       { MSG_NOSIGNAL, "MSG_NOSIGNAL"  },
+       { MSG_NOSIGNAL,         "MSG_NOSIGNAL"          },
 #endif
 #ifdef MSG_MORE
-       { MSG_MORE,     "MSG_MORE"      },
+       { MSG_MORE,             "MSG_MORE"              },
 #endif
-       { 0,            NULL            },
+#ifdef MSG_CMSG_CLOEXEC
+       { MSG_CMSG_CLOEXEC,     "MSG_CMSG_CLOEXEC"      },
+#endif
+       { 0,                    NULL                    },
 };
 
 static const struct xlat sockoptions[] = {