From ae4ec1a06d5b4c9bcb5647cf555aafd4e5f800f7 Mon Sep 17 00:00:00 2001
From: Bartek Gąsiorzewski <g.bartek@gmail.com>
Date: Mon, 07 May 2018 20:11:57 +0000
Subject: [PATCH] Exit with nonzero status on error
---
src/utils.c | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index f340a7e..1553ff7 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -7,13 +7,24 @@
#include <limits.h>
#ifdef WIN32
#include "unistd.h"
+#include "gettimeofday.h"
#else
#include <unistd.h>
+#include <sys/time.h>
#endif
#include "utils.h"
#pragma warning(disable: 4996)
+double what_time_is_it_now()
+{
+ struct timeval time;
+ if (gettimeofday(&time, NULL)) {
+ return 0;
+ }
+ return (double)time.tv_sec + (double)time.tv_usec * .000001;
+}
+
int *read_map(char *filename)
{
int n = 0;
@@ -197,19 +208,19 @@
{
perror(s);
assert(0);
- exit(-1);
+ exit(1);
}
void malloc_error()
{
fprintf(stderr, "Malloc error\n");
- exit(-1);
+ exit(1);
}
void file_error(char *s)
{
fprintf(stderr, "Couldn't open file: %s\n", s);
- exit(0);
+ exit(1);
}
list *split_str(char *s, char delim)
@@ -286,7 +297,11 @@
fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- if(line[curr-1] == '\n') line[curr-1] = '\0';
+ if(curr >= 2)
+ if(line[curr-2] == 0x0d) line[curr-2] = 0x00;
+
+ if(curr >= 1)
+ if(line[curr-1] == 0x0a) line[curr-1] = 0x00;
return line;
}
@@ -544,6 +559,15 @@
return max_i;
}
+int int_index(int *a, int val, int n)
+{
+ int i;
+ for (i = 0; i < n; ++i) {
+ if (a[i] == val) return i;
+ }
+ return -1;
+}
+
int rand_int(int min, int max)
{
if (max < min){
--
Gitblit v1.10.0