[brlcad-commits] SF.net SVN: brlcad:[47525] brlcad/trunk/src

[<br...@us...>]

Revision: 47525
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47525&view=rev
Author:   brlcad
Date:     2011-11-17 19:20:51 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
replace all calls to unlink() and remove() with calls to bu_file_delete() so we can get more consistent and portable behavior.

Modified Paths:
--------------
    brlcad/trunk/src/burst/burst.c
    brlcad/trunk/src/fbed/fbed.c
    brlcad/trunk/src/lgt/do_options.c
    brlcad/trunk/src/libbu/parallel.c
    brlcad/trunk/src/libbu/temp.c
    brlcad/trunk/src/libfb/if_X.c
    brlcad/trunk/src/libfb/if_X24.c
    brlcad/trunk/src/libfb/if_disk.c
    brlcad/trunk/src/libged/color.c
    brlcad/trunk/src/libged/edcodes.c
    brlcad/trunk/src/libged/edmater.c
    brlcad/trunk/src/libged/put_comb.c
    brlcad/trunk/src/libged/red.c
    brlcad/trunk/src/libged/tables.c
    brlcad/trunk/src/mged/tedit.c
    brlcad/trunk/src/remrt/remrt.c
    brlcad/trunk/src/shapes/human.c
    brlcad/trunk/src/shapes/tire.c
    brlcad/trunk/src/util/buffer.c

Modified: brlcad/trunk/src/burst/burst.c
===================================================================
--- brlcad/trunk/src/burst/burst.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/burst/burst.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -222,7 +222,7 @@
     if (tty)
 	closeUi(); /* keep screen straight */
     (void) fclose(tmpfp);
-    if (unlink(tmpfname) == -1)
+    if (!bu_file_delete(tmpfname))
 	locPerror(tmpfname);
     exit(code);
 }

Modified: brlcad/trunk/src/fbed/fbed.c
===================================================================
--- brlcad/trunk/src/fbed/fbed.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/fbed/fbed.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -1528,7 +1528,7 @@
 	    return 0;
 	if ( answer[0] == 'n' )
 	    return 0;
-	(void) unlink( rle_file_nm );
+	bu_file_delete(rle_file_nm);
     }
     prnt_Event( "Encoding \"%s\".", rle_file_nm );
     if ( fb_close( fbp ) == -1 )

Modified: brlcad/trunk/src/lgt/do_options.c
===================================================================
--- brlcad/trunk/src/lgt/do_options.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/lgt/do_options.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -712,9 +712,9 @@
 	fclose(fp);
 	fp = NULL;
     }
-    (void) unlink(script);
+    bu_file_delete(script);
 
-    return	1;
+    return 1;
 }
 
 

Modified: brlcad/trunk/src/libbu/parallel.c
===================================================================
--- brlcad/trunk/src/libbu/parallel.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libbu/parallel.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -483,8 +483,8 @@
 	return public_cpus;
     }
 
-    (void)unlink(PUBLIC_CPUS1);
-    (void)unlink(PUBLIC_CPUS2);
+    bu_file_delete(PUBLIC_CPUS1);
+    bu_file_delete(PUBLIC_CPUS2);
     if ((fp = fopen(PUBLIC_CPUS1, "wb")) != NULL ||
 	(fp = fopen(PUBLIC_CPUS2, "wb")) != NULL)
     {

Modified: brlcad/trunk/src/libbu/temp.c
===================================================================
--- brlcad/trunk/src/libbu/temp.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libbu/temp.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -69,7 +69,7 @@
 		popped->fd = -1;
 	    }
 	    if (BU_VLS_IS_INITIALIZED(&popped->fn) && bu_vls_addr(&popped->fn)) {
-		unlink(bu_vls_addr(&popped->fn));
+		bu_file_delete(bu_vls_addr(&popped->fn));
 		bu_vls_free(&popped->fn);
 	    }
 	    bu_free(popped, "free bu_temp_file node");
@@ -82,7 +82,7 @@
 	_bu_tf->fd = -1;
     }
     if (BU_VLS_IS_INITIALIZED(&_bu_tf->fn) && bu_vls_addr(&_bu_tf->fn)) {
-	unlink(bu_vls_addr(&_bu_tf->fn));
+	bu_file_delete(bu_vls_addr(&_bu_tf->fn));
 	bu_vls_free(&_bu_tf->fn);
     }
     bu_free(_bu_tf, "free bu_temp_file head");

Modified: brlcad/trunk/src/libfb/if_X.c
===================================================================
--- brlcad/trunk/src/libfb/if_X.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libfb/if_X.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -1157,7 +1157,7 @@
     /* Hack to save it into a file - this may go away */
     if (is_linear) {
 	/* no file => linear map */
-	(void) unlink(TMP_FILE);
+	bu_file_delete(TMP_FILE);
     } else {
 	/* save map for later */
 	i=creat(TMP_FILE, 0666);

Modified: brlcad/trunk/src/libfb/if_X24.c
===================================================================
--- brlcad/trunk/src/libfb/if_X24.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libfb/if_X24.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -2427,7 +2427,7 @@
 #endif
 
 #ifdef HAVE_SYS_MMAN_H
-    unlink(BS_NAME);
+    bu_file_delete(BS_NAME);
 #endif
 #ifdef HAVE_SYS_SHM_H
     if ((shmid = shmget(SHMEM_KEY, 0, 0)) < 0) {

Modified: brlcad/trunk/src/libfb/if_disk.c
===================================================================
--- brlcad/trunk/src/libfb/if_disk.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libfb/if_disk.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -109,7 +109,11 @@
 dsk_free(FBIO *ifp)
 {
     close(ifp->if_fd);
-    return unlink(ifp->if_name);
+    if (bu_file_delete(ifp->if_name)) {
+	return 0;
+    } else {
+	return 1;
+    }
 }
 
 

Modified: brlcad/trunk/src/libged/color.c
===================================================================
--- brlcad/trunk/src/libged/color.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libged/color.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -235,7 +235,7 @@
     }
 
     (void)fclose(fp);
-    (void)unlink(tmpfil);
+    bu_file_delete(tmpfil);
 
     /* if there are drawables, update their colors */
     if (gedp->ged_gdp)

Modified: brlcad/trunk/src/libged/edcodes.c
===================================================================
--- brlcad/trunk/src/libged/edcodes.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libged/edcodes.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -236,7 +236,7 @@
     av[i] = NULL;
 
     if (ged_wcodes(gedp, argc + 1, (const char **)av) == GED_ERROR) {
-	(void)unlink(tmpfil);
+	bu_file_delete(tmpfil);
 	bu_free((genptr_t)av, "ged_edcodes av");
 	return GED_ERROR;
     }
@@ -252,7 +252,7 @@
 
 	if ((f_srt=fopen(tmpfil, "r+")) == NULL) {
 	    bu_vls_printf(gedp->ged_result_str, "%s: Failed to open temp file for sorting\n", argv[0]);
-	    (void)unlink(tmpfil);
+	    bu_file_delete(tmpfil);
 	    return GED_ERROR;
 	}
 
@@ -296,7 +296,7 @@
     } else
 	status = GED_ERROR;
 
-    unlink(tmpfil);
+    bu_file_delete(tmpfil);
     bu_free((genptr_t)av, "ged_edcodes av");
     return status;
 }

Modified: brlcad/trunk/src/libged/edmater.c
===================================================================
--- brlcad/trunk/src/libged/edmater.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libged/edmater.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -86,7 +86,7 @@
     av[i] = NULL;
 
     if (ged_wmater(gedp, argc, av) == TCL_ERROR) {
-	(void)unlink(tmpfil);
+	bu_file_delete(tmpfil);
 	bu_free((genptr_t)av, "f_edmater: av");
 	return TCL_ERROR;
     }
@@ -101,7 +101,7 @@
 	status = TCL_ERROR;
     }
 
-    (void)unlink(tmpfil);
+    bu_file_delete(tmpfil);
     bu_free((genptr_t)av, "ged_edmater: av");
 
     return status;

Modified: brlcad/trunk/src/libged/put_comb.c
===================================================================
--- brlcad/trunk/src/libged/put_comb.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libged/put_comb.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -592,7 +592,7 @@
 	    restore_comb(gedp, dp, saved_name);
 	    bu_vls_printf(gedp->ged_result_str, "%s: \toriginal restored\n", argv[0]);
 	}
-	(void)unlink(_ged_tmpfil);
+	bu_file_delete(_ged_tmpfil);
 	return GED_ERROR;
     } else if (save_comb_flag) {
 	/* eliminate the temporary combination */
@@ -604,7 +604,7 @@
 	(void)ged_kill(gedp, 2, (const char **)av);
     }
 
-    (void)unlink(_ged_tmpfil);
+    bu_file_delete(_ged_tmpfil);
     return GED_OK;
 }
 

Modified: brlcad/trunk/src/libged/red.c
===================================================================
--- brlcad/trunk/src/libged/red.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libged/red.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -958,8 +958,7 @@
     ret = GED_OK;
 
 cleanup:
-    if (bu_file_exists(_ged_tmpfil))
-	unlink(_ged_tmpfil);
+    bu_file_delete(_ged_tmpfil);
 
     if (final_name) {
 	bu_vls_free(final_name);

Modified: brlcad/trunk/src/libged/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/libged/tables.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -409,7 +409,7 @@
     bu_vls_printf(gedp->ged_result_str, "Summary written in: %s\n", argv[1]);
 
     if (flag == SOL_TABLE || flag == REG_TABLE) {
-	(void)unlink("/tmp/mged_discr\0");
+	bu_file_delete("/tmp/mged_discr\0");
 	(void)fprintf(tabptr, "\n\nNumber Primitives = %ld  Number Regions = %ld\n",
 		      numsol, numreg);
 
@@ -447,7 +447,7 @@
 	if (ret != 0)
 	    bu_log("WARNING: cat failure detected\n");
 
-	(void)unlink("/tmp/ord_id\0");
+	bu_file_delete("/tmp/ord_id\0");
     }
 
 end:

Modified: brlcad/trunk/src/mged/tedit.c
===================================================================
--- brlcad/trunk/src/mged/tedit.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/mged/tedit.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -109,7 +109,7 @@
 	return TCL_ERROR;
 
     if (writesolid()) {
-	(void)unlink(tmpfil);
+	bu_file_delete(tmpfil);
 	return TCL_ERROR;
     }
 
@@ -117,7 +117,7 @@
 
     if (editit(argv[0], tmpfil) == TCL_OK) {
 	if (readsolid()) {
-	    (void)unlink(tmpfil);
+	    bu_file_delete(tmpfil);
 	    return TCL_ERROR;
 	}
 
@@ -127,7 +127,7 @@
 	Tcl_AppendResult(interp, "done\n", (char *)NULL);
     }
 
-    unlink(tmpfil);
+    bu_file_delete(tmpfil);
 
     return TCL_OK;
 }

Modified: brlcad/trunk/src/remrt/remrt.c
===================================================================
--- brlcad/trunk/src/remrt/remrt.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/remrt/remrt.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -1547,8 +1547,8 @@
 
     /* Final processing of output file */
     if ( fr->fr_tempfile )  {
-	/* Unlink temp file -- it is in framebuffer */
-	if ( unlink( fr->fr_filename ) < 0 )
+	/* Delete temp file -- it is in framebuffer */
+	if ( !bu_file_delete( fr->fr_filename ) )
 	    perror( fr->fr_filename );
     } else {
 	FILE *fp;

Modified: brlcad/trunk/src/shapes/human.c
===================================================================
--- brlcad/trunk/src/shapes/human.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/shapes/human.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -56,7 +56,7 @@
     wdb_close(db_fp);
 
     if (ret) {
-	unlink(filename);
+	bu_file_delete(filename);
 	bu_log("%s", bu_vls_addr(ged.ged_result_str));
 	ged_free(&ged);
 	return 1;

Modified: brlcad/trunk/src/shapes/tire.c
===================================================================
--- brlcad/trunk/src/shapes/tire.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/shapes/tire.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -64,7 +64,7 @@
     wdb_close(db_fp);
 
     if (ret) {
-	unlink(filename);
+	bu_file_delete(filename);
 	bu_log("%s", bu_vls_addr(ged.ged_result_str));
 	ged_free(&ged);
 	return 1;

Modified: brlcad/trunk/src/util/buffer.c
===================================================================
--- brlcad/trunk/src/util/buffer.c	2011-11-17 19:16:23 UTC (rev 47524)
+++ brlcad/trunk/src/util/buffer.c	2011-11-17 19:20:51 UTC (rev 47525)
@@ -42,17 +42,17 @@
 #define SIZE (1024*1024)
 
 
-char template[512] = {0};
-char buf[SIZE] = {0};
-
-
 int
 main(int argc, char *argv[])
 {
-    FILE *fp;
-    long count;
-    int tfd;
+    char template[512] = {0};
+    char buf[SIZE] = {0};
 
+    FILE *fp = NULL;
+    long count = 0;
+    int tfd = 0;
+    int ret = 0;
+
     if (argc > 1)
 	bu_log("%s: unrecognized argument(s)\n", argv[0]);
 
@@ -109,16 +109,20 @@
 	perror("buffer: tmp read");
 	goto err;
     }
-    (void)unlink(template);
-    return 0;
 
- err:
+    ret = 0;
+    goto clean;
+err:
+    ret = 1;
+clean:
+    /* clean up */
     if (fp) {
 	fclose(fp);
 	fp = NULL;
     }
-    unlink(template);
-    return 1;
+    bu_file_delete(template);
+
+    return ret;
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.