Changeset 992 for trunk/base

Timestamp:

Oct 8, 2002, 11:19:42 AM (22 years ago)

Author:

kevin

Message:

optimized exec cat to fcopy in reinplace
ftruncate(2) original file after performing substitutions
added ftruncate(2) command to Pextlib.c

Location:

trunk/base/src

Files:

• pextlib1.0/Pextlib.c (modified) (2 diffs)
• port1.0/portutil.tcl (modified) (2 diffs)

trunk/base/src/pextlib1.0/Pextlib.c

@@ -261 +261 @@
 }
 
+/* XXX: cannot set eof > 2GB */
+int FtruncateCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+        int fd, ret;
+        long eof = 0;
+        char *res;
+        Tcl_Channel channel;
+        ClientData handle;
+
+        if (objc > 3) {
+                Tcl_WrongNumArgs(interp, 1, objv, "channelId eof");
+                return TCL_ERROR;
+        }
+
+        if ((channel = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL)) == NULL)
+        return TCL_ERROR;
+
+        if (Tcl_GetChannelHandle(channel, TCL_READABLE|TCL_WRITABLE, &handle) != TCL_OK) {
+                Tcl_SetResult(interp, "error getting channel handle", TCL_STATIC);
+                return TCL_ERROR;
+        }
+        fd = (int) handle;
+
+        if (Tcl_GetLongFromObj(interp, objv[2], &eof) != TCL_OK) {
+                return TCL_ERROR;
+        }
+
+        if ((ret = ftruncate(fd, eof)) != 0)
+        {
+                switch(errno) {
+                        case EBADF:
+                                res = "EBADF";
+                                break;
+                        case EINVAL:
+                                res = "EINVAL";
+                                break;
+                        default:
+                                res = strerror(errno);
+                                break;
+                }
+                Tcl_SetResult(interp, (void *) res, TCL_STATIC);
+                return TCL_ERROR;
+        }
+        return TCL_OK;
+}
+
 int ReaddirCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
@@ -345 +391 @@
         Tcl_CreateObjCommand(interp, "system", SystemCmd, NULL, NULL);
         Tcl_CreateObjCommand(interp, "flock", FlockCmd, NULL, NULL);
+        Tcl_CreateObjCommand(interp, "ftruncate", FtruncateCmd, NULL, NULL);
         Tcl_CreateObjCommand(interp, "readdir", ReaddirCmd, NULL, NULL);
         Tcl_CreateObjCommand(interp, "strsed", StrsedCmd, NULL, NULL);

trunk/base/src/port1.0/portutil.tcl

@@ -325 +325 @@
     seek $input 0
 
-    if {[catch {exec cat <@$output >@$input 2>/dev/null} error]} {
+        # copy from strsed output back into the input
+    if {[catch {fcopy $output $input} error]} {
         ui_error "reinplace: $error"
         close $output
@@ -332 +333 @@
         return -code error "reinplace failed"
     }
+        
+        set eof [file size "$tmpfile"]
+        puts "$tmpfile $eof"
+        ftruncate $input $eof 
 
     close $output