[gentoo-commits] gentoo-projects commit in portage-utils/libq: copy_file.c libq.c md5_sha1_sum.c

[Mike Frysinger (vapier)]

vapier      11/02/23 22:58:52

  Modified:             libq.c md5_sha1_sum.c
  Added:                copy_file.c
  Log:
  rewrite merge code to take care of file updates ourself rather than shelling out

Revision  Changes    Path
1.23                 portage-utils/libq/libq.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.c?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.c?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.c?r1=1.22&r2=1.23

Index: libq.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/libq.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libq.c	23 Feb 2011 08:59:45 -0000	1.22
+++ libq.c	23 Feb 2011 22:58:52 -0000	1.23
@@ -20,6 +20,7 @@
 #include "which.c"
 #include "compat.c"
 
+#include "copy_file.c"
 #include "safe_io.c"
 #include "xchdir.c"
 #include "xgetcwd.c"



1.7                  portage-utils/libq/md5_sha1_sum.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/md5_sha1_sum.c?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/md5_sha1_sum.c?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/md5_sha1_sum.c?r1=1.6&r2=1.7

Index: md5_sha1_sum.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/md5_sha1_sum.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- md5_sha1_sum.c	25 Sep 2009 14:58:37 -0000	1.6
+++ md5_sha1_sum.c	23 Feb 2011 22:58:52 -0000	1.7
@@ -48,10 +48,10 @@
 	return (hex_value);
 }
 
-static unsigned char *hash_file(const char *filename, uint8_t hash_algo)
+static unsigned char *hash_file_at(int dfd, const char *filename, uint8_t hash_algo)
 {
 	int fd;
-	fd = open(filename, O_RDONLY);
+	fd = openat(dfd, filename, O_RDONLY);
 	if (fd != -1) {
 		static uint8_t hash_value_bin[20];
 		static unsigned char *hash_value;
@@ -64,3 +64,8 @@
 	}
 	return NULL;
 }
+
+static unsigned char *hash_file(const char *filename, uint8_t hash_algo)
+{
+	return hash_file_at(AT_FDCWD, filename, hash_algo);
+}



1.1                  portage-utils/libq/copy_file.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/copy_file.c?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/copy_file.c?rev=1.1&content-type=text/plain

Index: copy_file.c
===================================================================
static int copy_file_fd(int fd_src, int fd_dst)
{
	FILE *fp_src, *fp_dst;
	size_t rcnt, wcnt;
	char buf[BUFSIZE];

	/* dont fclose() as that implicitly close()'s */

	fp_src = fdopen(fd_src, "r");
	if (!fp_src)
		return -1;

	fp_dst = fdopen(fd_dst, "w");
	if (!fp_dst)
		return -1;

	while (1) {
		rcnt = fread(buf, sizeof(buf[0]), sizeof(buf), fp_src);
		if (!rcnt) {
			fflush(fp_dst);
			return feof(fp_src) ? 0 : -1;
		}

		wcnt = fwrite(buf, sizeof(buf[0]), rcnt, fp_dst);
		if (wcnt != rcnt) {
			if (ferror(fp_dst))
				return -1;
			fseek(fp_src, wcnt - rcnt, SEEK_CUR);
		}
	}
}