[58840] trunk/base/src/pextlib1.0
toby at macports.org
toby at macports.org
Mon Oct 5 22:30:43 PDT 2009
Revision: 58840
http://trac.macports.org/changeset/58840
Author: toby at macports.org
Date: 2009-10-05 22:30:41 -0700 (Mon, 05 Oct 2009)
Log Message:
-----------
move mktemp etc into a separate file
Modified Paths:
--------------
trunk/base/src/pextlib1.0/Makefile
trunk/base/src/pextlib1.0/Pextlib.c
Added Paths:
-----------
trunk/base/src/pextlib1.0/mktemp.c
trunk/base/src/pextlib1.0/mktemp.h
Modified: trunk/base/src/pextlib1.0/Makefile
===================================================================
--- trunk/base/src/pextlib1.0/Makefile 2009-10-06 05:24:00 UTC (rev 58839)
+++ trunk/base/src/pextlib1.0/Makefile 2009-10-06 05:30:41 UTC (rev 58840)
@@ -3,7 +3,7 @@
fs-traverse.o strcasecmp.o vercomp.o filemap.o \
sha1cmd.o curl.o rmd160cmd.o sha256cmd.o readline.o uid.o \
tracelib.o tty.o readdir.o pipe.o flock.o \
- system.o
+ system.o mktemp.o
SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
Modified: trunk/base/src/pextlib1.0/Pextlib.c
===================================================================
--- trunk/base/src/pextlib1.0/Pextlib.c 2009-10-06 05:24:00 UTC (rev 58839)
+++ trunk/base/src/pextlib1.0/Pextlib.c 2009-10-06 05:30:41 UTC (rev 58840)
@@ -100,6 +100,7 @@
#include "pipe.h"
#include "flock.h"
#include "system.h"
+#include "mktemp.h"
#if HAVE_CRT_EXTERNS_H
#include <crt_externs.h>
@@ -209,87 +210,6 @@
return TCL_OK;
}
-int MkdtempCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
- char *template, *sp;
- Tcl_Obj *tcl_result;
-
- if (objc != 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "template");
- return TCL_ERROR;
- }
-
- template = strdup(Tcl_GetString(objv[1]));
- if (template == NULL)
- return TCL_ERROR;
-
- if ((sp = mkdtemp(template)) == NULL) {
- Tcl_AppendResult(interp, "mkdtemp failed: ", strerror(errno), NULL);
- free(template);
- return TCL_ERROR;
- }
-
- tcl_result = Tcl_NewStringObj(sp, -1);
- Tcl_SetObjResult(interp, tcl_result);
- free(template);
- return TCL_OK;
-}
-
-int MktempCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
- char *template, *sp;
- Tcl_Obj *tcl_result;
-
- if (objc != 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "template");
- return TCL_ERROR;
- }
-
- template = strdup(Tcl_GetString(objv[1]));
- if (template == NULL)
- return TCL_ERROR;
-
- if ((sp = mktemp(template)) == NULL) {
- Tcl_AppendResult(interp, "mktemp failed: ", strerror(errno), NULL);
- free(template);
- return TCL_ERROR;
- }
-
- tcl_result = Tcl_NewStringObj(sp, -1);
- Tcl_SetObjResult(interp, tcl_result);
- free(template);
- return TCL_OK;
-}
-
-int MkstempCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
- Tcl_Channel channel;
- char *template, *channelname;
- int fd;
-
- if (objc != 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "template");
- return TCL_ERROR;
- }
-
- template = strdup(Tcl_GetString(objv[1]));
- if (template == NULL)
- return TCL_ERROR;
-
- if ((fd = mkstemp(template)) < 0) {
- Tcl_AppendResult(interp, "mkstemp failed: ", strerror(errno), NULL);
- free(template);
- return TCL_ERROR;
- }
-
- channel = Tcl_MakeFileChannel((ClientData)(intptr_t)fd, TCL_READABLE|TCL_WRITABLE);
- Tcl_RegisterChannel(interp, channel);
- channelname = (char *)Tcl_GetChannelName(channel);
- Tcl_AppendResult(interp, channelname, " ", template, NULL);
- free(template);
- return TCL_OK;
-}
-
int ExistsuserCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj *tcl_result;
Added: trunk/base/src/pextlib1.0/mktemp.c
===================================================================
--- trunk/base/src/pextlib1.0/mktemp.c (rev 0)
+++ trunk/base/src/pextlib1.0/mktemp.c 2009-10-06 05:30:41 UTC (rev 58840)
@@ -0,0 +1,125 @@
+/*
+ * mktemp.c
+ * $Id$
+ *
+ * Copyright (c) 2009 The MacPorts Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <tcl.h>
+
+#include "mktemp.h"
+
+int MkdtempCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+ char *template, *sp;
+ Tcl_Obj *tcl_result;
+
+ if (objc != 2) {
+ Tcl_WrongNumArgs(interp, 1, objv, "template");
+ return TCL_ERROR;
+ }
+
+ template = strdup(Tcl_GetString(objv[1]));
+ if (template == NULL)
+ return TCL_ERROR;
+
+ if ((sp = mkdtemp(template)) == NULL) {
+ Tcl_AppendResult(interp, "mkdtemp failed: ", strerror(errno), NULL);
+ free(template);
+ return TCL_ERROR;
+ }
+
+ tcl_result = Tcl_NewStringObj(sp, -1);
+ Tcl_SetObjResult(interp, tcl_result);
+ free(template);
+ return TCL_OK;
+}
+
+int MktempCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+ char *template, *sp;
+ Tcl_Obj *tcl_result;
+
+ if (objc != 2) {
+ Tcl_WrongNumArgs(interp, 1, objv, "template");
+ return TCL_ERROR;
+ }
+
+ template = strdup(Tcl_GetString(objv[1]));
+ if (template == NULL)
+ return TCL_ERROR;
+
+ if ((sp = mktemp(template)) == NULL) {
+ Tcl_AppendResult(interp, "mktemp failed: ", strerror(errno), NULL);
+ free(template);
+ return TCL_ERROR;
+ }
+
+ tcl_result = Tcl_NewStringObj(sp, -1);
+ Tcl_SetObjResult(interp, tcl_result);
+ free(template);
+ return TCL_OK;
+}
+
+int MkstempCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+ Tcl_Channel channel;
+ char *template, *channelname;
+ int fd;
+
+ if (objc != 2) {
+ Tcl_WrongNumArgs(interp, 1, objv, "template");
+ return TCL_ERROR;
+ }
+
+ template = strdup(Tcl_GetString(objv[1]));
+ if (template == NULL)
+ return TCL_ERROR;
+
+ if ((fd = mkstemp(template)) < 0) {
+ Tcl_AppendResult(interp, "mkstemp failed: ", strerror(errno), NULL);
+ free(template);
+ return TCL_ERROR;
+ }
+
+ channel = Tcl_MakeFileChannel((ClientData)(intptr_t)fd, TCL_READABLE|TCL_WRITABLE);
+ Tcl_RegisterChannel(interp, channel);
+ channelname = (char *)Tcl_GetChannelName(channel);
+ Tcl_AppendResult(interp, channelname, " ", template, NULL);
+ free(template);
+ return TCL_OK;
+}
Property changes on: trunk/base/src/pextlib1.0/mktemp.c
___________________________________________________________________
Added: svn:keywords
+ Id
Added: trunk/base/src/pextlib1.0/mktemp.h
===================================================================
--- trunk/base/src/pextlib1.0/mktemp.h (rev 0)
+++ trunk/base/src/pextlib1.0/mktemp.h 2009-10-06 05:30:41 UTC (rev 58840)
@@ -0,0 +1,35 @@
+/*
+ * mktemp.h
+ * $Id$
+ *
+ * Copyright (c) 2009 The MacPorts Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+int MkdtempCmd(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int MktempCmd(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int MkstempCmd(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
Property changes on: trunk/base/src/pextlib1.0/mktemp.h
___________________________________________________________________
Added: svn:keywords
+ Id
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091005/0c0de1e9/attachment-0001.html>
More information about the macports-changes
mailing list