logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0005-Use-standard-C-functions.patch (6657B)

    

  1. From af353da1558da816a014983d3abaafaa4929e04c Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 5 Jun 2016 17:42:29 -0700
  4. Subject: [PATCH] Use standard C functions
  6. ---
  7.  sshfs.c | 91 ++++++++++++++++++++++++++++++++++-----------------------
  8.  1 file changed, 55 insertions(+), 36 deletions(-)
  10. diff --git a/sshfs.c b/sshfs.c
  11. index 9c074a3..17f7d6a 100644
  12. --- a/sshfs.c
  13. +++ b/sshfs.c
  14. @@ -671,25 +671,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
  15.  	if (sshfs.base_path[0]) {
  16.  		if (path[1]) {
  17.  			if (sshfs.base_path[strlen(sshfs.base_path)-1] != '/') {
  18. -				realpath = g_strdup_printf("%s/%s",
  19. -							   sshfs.base_path,
  20. -							   path + 1);
  21. +				if (asprintf(&realpath, "%s/%s", sshfs.base_path, path + 1) < 0)
  22. +					abort();
  23.  			} else {
  24. -				realpath = g_strdup_printf("%s%s",
  25. -							   sshfs.base_path,
  26. -							   path + 1);
  27. +				if (asprintf(&realpath, "%s%s", sshfs.base_path, path + 1) < 0)
  28. +					abort();
  29.  			}
  30.  		} else {
  31. -			realpath = g_strdup(sshfs.base_path);
  32. +			realpath = strdup(sshfs.base_path);
  33.  		}
  34.  	} else {
  35.  		if (path[1])
  36. -			realpath = g_strdup(path + 1);
  37. +			realpath = strdup(path + 1);
  38.  		else
  39. -			realpath = g_strdup(".");
  40. +			realpath = strdup(".");
  41.  	}
  42. +	if (!realpath)
  43. +		abort();
  44.  	buf_add_string(buf, realpath);
  45. -	g_free(realpath);
  46. +	free(realpath);
  47.  }
  48.  
  49.  static int buf_check_get(struct buffer *buf, size_t len)
  50. @@ -1272,7 +1272,7 @@ static void request_free(struct request *req)
  51.  {
  52.  	buf_free(&req->reply);
  53.  	sem_destroy(&req->ready);
  54. -	g_free(req);
  55. +	free(req);
  56.  }
  57.  
  58.  static int request_table_insert(struct request_table *reqtab, struct request *req)
  59. @@ -1320,9 +1320,9 @@ static void chunk_free(struct read_chunk *chunk)
  60.  		rreq = list_entry(chunk->reqs.prev, struct read_req, list);
  61.  		list_del(&rreq->list);
  62.  		buf_free(&rreq->data);
  63. -		g_free(rreq);
  64. +		free(rreq);
  65.  	}
  66. -	g_free(chunk);
  67. +	free(chunk);
  68.  }
  69.  
  70.  static void chunk_put(struct read_chunk *chunk)
  71. @@ -1871,8 +1871,10 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
  72.                               struct request **reqp)
  73.  {
  74.  	int err;
  75. -	struct request *req = g_new0(struct request, 1);
  76. +	struct request *req = calloc(1, sizeof(struct request));
  77.  
  78. +	if (!req)
  79. +		return -ENOMEM;
  80.  	req->want_reply = want_reply;
  81.  	req->end_func = end_func;
  82.  	req->data = data;
  83. @@ -2579,8 +2581,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
  84.  
  85.  	if (fi->flags & O_APPEND)
  86.  		pflags |= SSH_FXF_APPEND;
  87. -	
  88. -	sf = g_new0(struct sshfs_file, 1);
  89. +
  90. +	sf = calloc(1, sizeof(struct sshfs_file));
  91. +	if (!sf)
  92. +		return -ENOMEM;
  93.  	list_init(&sf->write_reqs);
  94.  	pthread_cond_init(&sf->write_finished, NULL);
  95.  	/* Assume random read after open */
  96. @@ -2624,7 +2628,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
  97.  	} else {
  98.  		if (sshfs.dir_cache)
  99.  			cache_invalidate(path);
  100. -		g_free(sf);
  101. +		free(sf);
  102.  	}
  103.  	buf_free(&buf);
  104.  	return err;
  105. @@ -2691,7 +2695,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
  106.  {
  107.  	sf->refs--;
  108.  	if (!sf->refs)
  109. -		g_free(sf);
  110. +		free(sf);
  111.  }
  112.  
  113.  static void sshfs_file_get(struct sshfs_file *sf)
  114. @@ -2761,9 +2765,11 @@ static void sshfs_read_begin(struct request *req)
  115.  static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
  116.  					  off_t offset)
  117.  {
  118. -	struct read_chunk *chunk = g_new0(struct read_chunk, 1);
  119. +	struct read_chunk *chunk = calloc(1, sizeof(struct read_chunk));
  120.  	struct buffer *handle = &sf->handle;
  121.  
  122. +	if (!chunk)
  123. +		abort();
  124.  	pthread_cond_init(&chunk->sio.finished, NULL);
  125.  	list_init(&chunk->reqs);
  126.  	chunk->size = size;
  127. @@ -2777,7 +2783,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
  128.  		struct read_req *rreq;
  129.  		size_t bsize = size < sshfs.max_read ? size : sshfs.max_read;
  130.  
  131. -		rreq = g_new0(struct read_req, 1);
  132. +		rreq = calloc(1, sizeof(struct read_req));
  133. +		if (!rreq)
  134. +			abort();
  135.  		rreq->sio = &chunk->sio;
  136.  		rreq->size = bsize;
  137.  		buf_init(&rreq->data, 0);
  138. @@ -2848,7 +2856,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
  139.  			size -= rreq->res;
  140.  			list_del(&rreq->list);
  141.  			buf_free(&rreq->data);
  142. -			g_free(rreq);
  143. +			free(rreq);
  144.  		}
  145.  	}
  146.  
  147. @@ -3473,9 +3481,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  148.  	switch (key) {
  149.  	case FUSE_OPT_KEY_OPT:
  150.  		if (is_ssh_opt(arg)) {
  151. -			tmp = g_strdup_printf("-o%s", arg);
  152. +			if (asprintf(&tmp, "-o%s", arg) < 0)
  153. +				abort();
  154.  			ssh_add_arg(tmp);
  155. -			g_free(tmp);
  156. +			free(tmp);
  157.  			return 0;
  158.  		}
  159.  		/* Pass through */
  160. @@ -3544,9 +3553,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  161.  
  162.  
  163.  	case KEY_PORT:
  164. -		tmp = g_strdup_printf("-oPort=%s", arg + 2);
  165. +		if (asprintf(&tmp, "-oPort=%s", arg + 2) < 0)
  166. +			abort();
  167.  		ssh_add_arg(tmp);
  168. -		g_free(tmp);
  169. +		free(tmp);
  170.  		return 0;
  171.  
  172.  	case KEY_COMPRESS:
  173. @@ -3554,9 +3564,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  174.  		return 0;
  175.  
  176.  	case KEY_CONFIGFILE:
  177. -		tmp = g_strdup_printf("-F%s", arg + 2);
  178. +		if (asprintf(&tmp, "-F%s", arg + 2) < 0)
  179. +			abort();
  180.  		ssh_add_arg(tmp);
  181. -		g_free(tmp);
  182. +		free(tmp);
  183.  		return 0;
  184.  
  185.  	default:
  186. @@ -3732,17 +3743,19 @@ static char *find_base_path(void)
  187.  
  188.  static char *fsname_escape_commas(char *fsnameold)
  189.  {
  190. -	char *fsname = g_malloc(strlen(fsnameold) * 2 + 1);
  191. +	char *fsname = malloc(strlen(fsnameold) * 2 + 1);
  192.  	char *d = fsname;
  193.  	char *s;
  194.  
  195. +	if (!fsname)
  196. +		abort();
  197.  	for (s = fsnameold; *s; s++) {
  198.  		if (*s == '\\' || *s == ',')
  199.  			*d++ = '\\';
  200.  		*d++ = *s;
  201.  	}
  202.  	*d = '\0';
  203. -	g_free(fsnameold);
  204. +	free(fsnameold);
  205.  
  206.  	return fsname;
  207.  }
  208. @@ -4083,15 +4096,20 @@ int main(int argc, char *argv[])
  209.  	else
  210.  		sshfs.max_outstanding_len = ~0;
  211.  
  212. -	fsname = g_strdup(sshfs.host);
  213. -	sshfs.base_path = g_strdup(find_base_path());
  214. +	fsname = strdup(sshfs.host);
  215. +	if (!fsname)
  216. +		abort();
  217. +	sshfs.base_path = strdup(find_base_path());
  218. +	if (!sshfs.base_path)
  219. +		abort();
  220.  
  221.  	if (sshfs.ssh_command)
  222.  		set_ssh_command();
  223.  
  224. -	tmp = g_strdup_printf("-%i", sshfs.ssh_ver);
  225. +	if (asprintf(&tmp, "-%i", sshfs.ssh_ver) < 0)
  226. +		abort();
  227.  	ssh_add_arg(tmp);
  228. -	g_free(tmp);
  229. +	free(tmp);
  230.  	ssh_add_arg(sshfs.host);
  231.  	if (sshfs.sftp_server)
  232.  		sftp_server = sshfs.sftp_server;
  233. @@ -4118,10 +4136,11 @@ int main(int argc, char *argv[])
  234.  		sshfs.max_write = 65536;
  235.  
  236.          fsname = fsname_escape_commas(fsname);
  237. -	tmp = g_strdup_printf("-osubtype=sshfs,fsname=%s", fsname);
  238. +	if (asprintf(&tmp, "-osubtype=sshfs,fsname=%s", fsname) < 0)
  239. +		abort();
  240.  	fuse_opt_insert_arg(&args, 1, tmp);
  241. -	g_free(tmp);
  242. -	g_free(fsname);
  243. +	free(tmp);
  244. +	free(fsname);
  245.  
  246.  	if(sshfs.dir_cache)
  247.  		sshfs.op = cache_wrap(&sshfs_oper);
  248. -- 
  249. 2.24.0