diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2010-12-07 18:11:18 -0700 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:08 +0100 |
| commit | 5084f60ed55119d709cfd7f75fcc5823f58bc094 (patch) | |
| tree | 5accca8352c77a852d6fec8b67fc6c3b810586e1 /src/facetron.c | |
| parent | c85230a897b62f223951f7cc5693c6175e2d673d (diff) | |
Remove use of horribly ambiguous basename() function
Diffstat (limited to 'src/facetron.c')
| -rw-r--r-- | src/facetron.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/facetron.c b/src/facetron.c index f16de2f7..5223e070 100644 --- a/src/facetron.c +++ b/src/facetron.c @@ -394,12 +394,13 @@ int main(int argc, char *argv[]) /* Mangle the filename now */ if ( config_basename ) { char *tmp; - tmp = strdup(basename(filename)); + tmp = safe_basename(filename); free(filename); filename = tmp; } fnamereal = malloc(1024); snprintf(fnamereal, 1023, "%s%s", prefix, filename); + free(filename); images[i].filename = fnamereal; images[i].div = beam->divergence; @@ -416,8 +417,6 @@ int main(int argc, char *argv[]) /* Get reflections from this image */ integrate_image(&images[i]); - free(filename); - progress_bar(i, n_total_patterns-1, "Loading pattern data"); } |