[Astlinux-commits] SF.net SVN: astlinux:[7935] branches/1.0/package/makedevs/makedevs.c

[<abe...@us...>]

Revision: 7935
          http://sourceforge.net/p/astlinux/code/7935
Author:   abelbeck
Date:     2016-11-06 22:45:27 +0000 (Sun, 06 Nov 2016)
Log Message:
-----------
build system, host-makedevs, implement upstream Buildroot fixes, one 'mknod' call added since we are using fakeroot
Ref: https://git.buildroot.net/buildroot/commit/package/makedevs?id=ab1b6f7df4355244dfc54b877889ff7a3cde02a0
Ref: https://git.buildroot.net/buildroot/commit/package/makedevs?id=c85cd189dc1ded92b78c5968860ff447ec9815ad

Modified Paths:
--------------
    branches/1.0/package/makedevs/makedevs.c

Modified: branches/1.0/package/makedevs/makedevs.c
===================================================================
--- branches/1.0/package/makedevs/makedevs.c	2016-11-06 18:13:41 UTC (rev 7934)
+++ branches/1.0/package/makedevs/makedevs.c	2016-11-06 22:45:27 UTC (rev 7935)
@@ -500,6 +500,9 @@
 		} else
 		{
 			dev_t rdev;
+			unsigned i;
+			char *full_name_inc;
+			struct stat st;
 
 			if (type == 'p') {
 				mode |= S_IFIFO;
@@ -515,43 +518,38 @@
 				goto loop;
 			}
 
-			if (count > 0) {
-				int i;
-				char *full_name_inc;
-
-				full_name_inc = xmalloc(strlen(full_name) + 8);
-				for (i = 0; i < count; i++) {
-					sprintf(full_name_inc, "%s%d", full_name, start + i);
-					rdev = makedev(major, minor + i * increment);
-					if (mknod(full_name_inc, mode, rdev) == -1) {
-						bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name_inc);
+			full_name_inc = xmalloc(strlen(full_name) + sizeof(int)*3 + 2);
+			if (count)
+				count--;
+			for (i = start; i <= start + count; i++) {
+				sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i);
+				rdev = makedev(major, minor + (i - start) * increment);
+				mknod(full_name_inc, mode, rdev);       /* mknod required if using fakeroot */
+				if (stat(full_name_inc, &st) == 0) {
+					if ((mode & S_IFMT) != (st.st_mode & S_IFMT)) {
+						bb_error_msg("line %d: node %s exists but is of wrong file type", linenum, full_name_inc);
 						ret = EXIT_FAILURE;
+						continue;
 					}
-					else if (chown(full_name_inc, uid, gid) == -1) {
-						bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);
+					if (st.st_rdev != rdev) {
+						bb_error_msg("line %d: node %s exists but is wrong device number", linenum, full_name_inc);
 						ret = EXIT_FAILURE;
+						continue;
 					}
-					if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){
-						bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc);
-						ret = EXIT_FAILURE;
-					}
-				}
-				free(full_name_inc);
-			} else {
-				rdev = makedev(major, minor);
-				if (mknod(full_name, mode, rdev) == -1) {
-					bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name);
+				} else if (mknod(full_name_inc, mode, rdev) < 0) {
+					bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc);
 					ret = EXIT_FAILURE;
+					continue;
 				}
-				else if (chown(full_name, uid, gid) == -1) {
-					bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
+				if (chown(full_name_inc, uid, gid) < 0) {
+					bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc);
 					ret = EXIT_FAILURE;
-				}
-				if ((mode != -1) && (chmod(full_name, mode) < 0)){
-					bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
+				} else if (chmod(full_name_inc, mode) < 0) {
+					bb_perror_msg("line %d: can't chmod %s", linenum, full_name_inc);
 					ret = EXIT_FAILURE;
 				}
 			}
+			free(full_name_inc);
 		}
 loop:
 		free(line);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.