Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
pkg-clean: fix logic for 'latest version'
Kyle Evans committed 5 years ago
commit 622b4cafcbadb9614fa4d023d56da95687e8430a
parent ff879d6
1 file changed +7 -7
modified src/clean.c
@@ -180,27 +180,27 @@ populate_sums(struct pkgdb *db)
}

/*
-
 * Extract hash from filename in format <name>-<version>-<hash>.txz
+
 * Extract hash from filename in format <name>-<version>~<hash>.txz
 */
static bool
extract_filename_sum(const char *fname, char sum[])
{
-
	const char *dash_pos, *dot_pos;
+
	const char *tilde_pos, *dot_pos;

	dot_pos = strrchr(fname, '.');
	if (dot_pos == NULL)
		dot_pos = fname + strlen(fname);

-
	dash_pos = strrchr(fname, '-');
-
	if (dash_pos == NULL)
+
	tilde_pos = strrchr(fname, '~');
+
	if (tilde_pos == NULL)
		return (false);
-
	else if (dot_pos < dash_pos)
+
	else if (dot_pos < tilde_pos)
		dot_pos = fname + strlen(fname);

-
	if (dot_pos - dash_pos != PKG_FILE_CKSUM_CHARS + 1)
+
	if (dot_pos - tilde_pos != PKG_FILE_CKSUM_CHARS + 1)
		return (false);

-
	strlcpy(sum, dash_pos + 1, PKG_FILE_CKSUM_CHARS + 1);
+
	strlcpy(sum, tilde_pos + 1, PKG_FILE_CKSUM_CHARS + 1);
	return (true);
}