Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 1b33d12
pkg_compat: read +DISPLAY as "display" node and remove useless "mtree" node
Philippe Pepiot committed 15 years ago
commit 1b33d1292d11c23317af9995f2517c0a133ceef3
parent a6dcde7
1 file changed +13 -6
modified libpkg/pkg_compat.c
@@ -181,16 +181,12 @@ pkg_compat_read_plist(cJSON *pkg, char *plist_str)
				cJSON_AddItemToArray(cJSON_GetObjectItem(pkg, "deps"), object);

				break;
- 
			case PLIST_MTREE:
- 
			case PLIST_DISPLAY:
- 
				snprintf(path_file, MAXPATHLEN, "%s/%s", prefix, cp);
- 
				cJSON_AddStringToObject(pkg, (cmd == PLIST_MTREE) ? "mtree" : "display", path_file);
- 
				break;
- 


			case PLIST_CONFLICTS:

				cJSON_AddItemToArray(cJSON_GetObjectItem(pkg, "conflicts"), cJSON_CreateString(cp));

				break;
+ 
			case PLIST_MTREE:
+ 
			case PLIST_DISPLAY:

			case PLIST_DIR_RM:

			case PLIST_COMMENT:

			case PLIST_IGNORE:
@@ -294,6 +290,17 @@ pkg_compat_convert_installed(const char *pkg_dbdir, char *pkgname, char *manifes
		free(buffer);

	}
+
+ 
	/* adding display */
+ 
	tmp = strrchr(filepath, '+');
+ 
	tmp[0] = '\0';
+ 
	strlcat(filepath, "+DISPLAY", MAXPATHLEN);
+
+ 
	/* ignore if no +DISPLAY */
+ 
	if ((buffer_len = file_to_buffer(filepath, &buffer)) != -1) {
+ 
		cJSON_AddStringToObject(rootpkg, "display", buffer);
+ 
	}
+ 


	/* write the new manifest */

	cjson_output = cJSON_Print(rootpkg);

	fs = fopen(manifestpath, "w+");