Ticket #132: add_SafeDosQueryAppType.diff

libc/include/os2safe.h

@@ -36 +36 @@
 #define DosWaitNPipe            SafeDosWaitNPipe
 #define DosSetFilePtr           SafeDosSetFilePtr
 #define DosSetFilePtrL          SafeDosSetFilePtrL
 #define DosDupHandle            SafeDosDupHandle
 #define DosOpenL                SafeDosOpenL
 #define DosQueryFHState         SafeDosQueryFHState
 #define DosSetDateTime          SafeDosSetDateTime
 #define DosStartSession         SafeDosStartSession
+#define DosQueryAppType         SafeDosQueryAppType
 
 #endif

new file libc/src/libos2/safe/SafeDosQueryAppType.c

@@ +1 @@
+/* $Id$ */
+/** @file
+ *
+ * SafeDosQueryAppType()
+ *
+ * Copyright (c) 2007 Peter Weilbacher <mozilla@weilbacher.org>
+ * Copyright (c) 2003 knut st. osmundsen <bird-srcspam@anduin.net>
+ *                    (code adapted from SafeDosQueryFHState.c and SafeDosOpenL.c)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with This program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define INCL_BASE
+#include <os2.h>
+#include "safe.h"
+
+APIRET APIENTRY SafeDosQueryAppType(PSZ pszFile, PULONG pulFlags);
+APIRET APIENTRY SafeDosQueryAppType(PSZ pszFile, PULONG pulFlags)
+{
+    ULONG   rc, ul;
+    PULONG  pul = NULL;
+    // even though pszFile is PSZ and not PSCZ, use of the PCSZ macros
+    // should be safe
+    SAFE_PCSZ(pszFile);
+
+    if (pulFlags)
+    {
+        ul = *pulFlags;
+        pul = &ul;
+    }
+
+    rc = DosQueryAppType(SAFE_PCSZ_USE(pszFile), pul);
+
+    if (pulFlags)
+        *pulFlags = ul;
+
+    SAFE_PCSZ_DONE(pszFile);
+    SAFE_DOS_FAILURE();
+
+    return rc;
+}
+