From 7c45b15da28ef8a95a3a886594b3c74abd15faa1 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 10 Mar 2016 08:28:31 +0000
Subject: [PATCH] Some local changes
---
src/io.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/io.c b/src/io.c
index e7461d6..51ef836 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include "general.h"
#include<stdio.h>
#include "io.h"
@@ -455,7 +456,7 @@
{"dump-filename", required_argument,0, 'f'},
{"tape-options",required_argument,0,'c'},
{"tape-template", required_argument,0,0},
- {"dump-from-vtk",required_argument,0,0},
+ {"restore-from-vtk",required_argument,0,0},
{0, 0, 0, 0}
};
/* getopt_long stores the option index here. */
@@ -482,7 +483,7 @@
if(strcmp(long_options[option_index].name,"tape-template")==0){
strcpy(command_line_args.tape_templatefull,optarg);
}
- if(strcmp(long_options[option_index].name,"dump-from-vtk")==0){
+ if(strcmp(long_options[option_index].name,"restore-from-vtk")==0){
strcpy(command_line_args.dump_from_vtk,optarg);
}
break;
@@ -1000,6 +1001,20 @@
ts_tape *parsetape(char *filename){
+ FILE *fd = fopen (filename, "r");
+ long length;
+ size_t size;
+ fseek (fd, 0, SEEK_END);
+ length = ftell (fd);
+ fseek (fd, 0, SEEK_SET);
+ size=fread (tapetxt, 1, length, fd);
+ fclose(fd);
+ if(size);
+ ts_tape *tape=parsetapebuffer(tapetxt);
+ return tape;
+}
+
+ts_tape *parsetapebuffer(char *buffer){
ts_tape *tape=(ts_tape *)calloc(1,sizeof(ts_tape));
tape->multiprocessing=calloc(255,sizeof(char));
@@ -1038,7 +1053,7 @@
cfg_t *cfg;
ts_uint retval;
cfg = cfg_init(opts, 0);
- retval=cfg_parse(cfg, filename);
+ retval=cfg_parse_buf(cfg, buffer);
if(retval==CFG_FILE_ERROR){
fatal("No tape file.",100);
}
--
Gitblit v1.9.3