From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Oct 2022 13:29:26 +0000 (+0000)
Subject: file: Rename user/group to uname/gname
X-Git-Tag: 0.9.28~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302e32533452d7cfb532510bcf22d6488159039f;p=pakfire.git

file: Rename user/group to uname/gname

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/_pakfire/file.c b/src/_pakfire/file.c
index d0697bdb3..a6ed35fce 100644
--- a/src/_pakfire/file.c
+++ b/src/_pakfire/file.c
@@ -108,33 +108,33 @@ static PyObject* File_get_type(FileObject* self) {
 	return PyLong_FromLong(type);
 }
 
-static PyObject* File_get_user(FileObject* self) {
-	const char* user = pakfire_file_get_user(self->file);
+static PyObject* File_get_uname(FileObject* self) {
+	const char* uname = pakfire_file_get_uname(self->file);
 
-	return PyUnicode_FromString(user);
+	return PyUnicode_FromString(uname);
 }
 
-static int File_set_user(FileObject* self, PyObject* value) {
-	const char* user = PyUnicode_AsUTF8(value);
-	if (!user)
+static int File_set_uname(FileObject* self, PyObject* value) {
+	const char* uname = PyUnicode_AsUTF8(value);
+	if (!uname)
 		return -1;
 
-	pakfire_file_set_user(self->file, user);
+	pakfire_file_set_uname(self->file, uname);
 	return 0;
 }
 
-static PyObject* File_get_group(FileObject* self) {
-	const char* group = pakfire_file_get_group(self->file);
+static PyObject* File_get_gname(FileObject* self) {
+	const char* gname = pakfire_file_get_gname(self->file);
 
-	return PyUnicode_FromString(group);
+	return PyUnicode_FromString(gname);
 }
 
-static int File_set_group(FileObject* self, PyObject* value) {
-	const char* group = PyUnicode_AsUTF8(value);
-	if (!group)
+static int File_set_gname(FileObject* self, PyObject* value) {
+	const char* gname = PyUnicode_AsUTF8(value);
+	if (!gname)
 		return -1;
 
-	pakfire_file_set_group(self->file, group);
+	pakfire_file_set_gname(self->file, gname);
 	return 0;
 }
 
@@ -272,9 +272,9 @@ static struct PyGetSetDef File_getsetters[] = {
 		NULL,
 	},
 	{
-		"group",
-		(getter)File_get_group,
-		(setter)File_set_group,
+		"gname",
+		(getter)File_get_gname,
+		(setter)File_set_gname,
 		NULL,
 		NULL,
 	},
@@ -314,9 +314,9 @@ static struct PyGetSetDef File_getsetters[] = {
 		NULL,
 	},
 	{
-		"user",
-		(getter)File_get_user,
-		(setter)File_set_user,
+		"uname",
+		(getter)File_get_uname,
+		(setter)File_set_uname,
 		NULL,
 		NULL,
 	},
diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index 1c1e5038e..15a26539f 100644
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -1087,22 +1087,22 @@ static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, struct
 			goto END;
 		}
 
-		// Bind user
-		const char* user = pakfire_file_get_user(file);
+		// Bind uname
+		const char* uname = pakfire_file_get_uname(file);
 
-		r = sqlite3_bind_text(stmt, 7, user, -1, NULL);
+		r = sqlite3_bind_text(stmt, 7, uname, -1, NULL);
 		if (r) {
-			ERROR(db->pakfire, "Could not bind user: %s\n", sqlite3_errmsg(db->handle));
+			ERROR(db->pakfire, "Could not bind uname: %s\n", sqlite3_errmsg(db->handle));
 			pakfire_file_unref(file);
 			goto END;
 		}
 
-		// Bind group
-		const char* group = pakfire_file_get_group(file);
+		// Bind gname
+		const char* gname = pakfire_file_get_gname(file);
 
-		r = sqlite3_bind_text(stmt, 8, group, -1, NULL);
+		r = sqlite3_bind_text(stmt, 8, gname, -1, NULL);
 		if (r) {
-			ERROR(db->pakfire, "Could not bind group: %s\n", sqlite3_errmsg(db->handle));
+			ERROR(db->pakfire, "Could not bind gname: %s\n", sqlite3_errmsg(db->handle));
 			pakfire_file_unref(file);
 			goto END;
 		}
@@ -2134,37 +2134,37 @@ static int pakfire_db_load_file(struct pakfire_db* db, struct pakfire_filelist*
 	if (mode)
 		pakfire_file_set_mode(file, mode);
 
-	// User
-	const char* user = (const char*)sqlite3_column_text(stmt, 3);
+	// uname
+	const char* uname = (const char*)sqlite3_column_text(stmt, 3);
 
 	// Abort if no user is set
-	if (!user) {
+	if (!uname) {
 		ERROR(db->pakfire, "%s: No user\n", path);
 		r = 1;
 		goto ERROR;
 	}
 
-	// Set user
-	r = pakfire_file_set_user(file, user);
+	// Set uname
+	r = pakfire_file_set_uname(file, uname);
 	if (r) {
-		ERROR(db->pakfire, "%s: Could not set user '%s': %m\n", path, user);
+		ERROR(db->pakfire, "%s: Could not set user '%s': %m\n", path, uname);
 		goto ERROR;
 	}
 
-	// Group
-	const char* group = (const char*)sqlite3_column_text(stmt, 4);
+	// gname
+	const char* gname = (const char*)sqlite3_column_text(stmt, 4);
 
 	// Abort if no group is set
-	if (!group) {
+	if (!gname) {
 		ERROR(db->pakfire, "%s: No group\n", path);
 		r = 1;
 		goto ERROR;
 	}
 
-	// Set group
-	r = pakfire_file_set_group(file, group);
+	// Set gname
+	r = pakfire_file_set_gname(file, gname);
 	if (r) {
-		ERROR(db->pakfire, "%s: Could not set group '%s': %m\n", path, group);
+		ERROR(db->pakfire, "%s: Could not set group '%s': %m\n", path, gname);
 		goto ERROR;
 	}
 
diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c
index c57ba6eb6..ff17f7443 100644
--- a/src/libpakfire/file.c
+++ b/src/libpakfire/file.c
@@ -63,8 +63,8 @@ struct pakfire_file {
 	char abspath[PATH_MAX];
 
 	// File Ownership
-	char user[LOGIN_NAME_MAX];
-	char group[LOGIN_NAME_MAX];
+	char uname[LOGIN_NAME_MAX];
+	char gname[LOGIN_NAME_MAX];
 
 	// Stat
 	struct stat st;
@@ -136,11 +136,11 @@ static int pakfire_file_from_archive_entry(struct pakfire_file* file, struct arc
 	if (archive_entry_dev_is_set(entry))
 		pakfire_file_set_dev(file, archive_entry_dev(entry));
 
-	// Set user
-	pakfire_file_set_user(file, archive_entry_uname(entry));
+	// Set uname
+	pakfire_file_set_uname(file, archive_entry_uname(entry));
 
-	// Set group
-	pakfire_file_set_group(file, archive_entry_gname(entry));
+	// Set gname
+	pakfire_file_set_gname(file, archive_entry_gname(entry));
 
 	// Set times
 	pakfire_file_set_ctime(file, archive_entry_ctime(entry));
@@ -301,11 +301,11 @@ struct archive_entry* pakfire_file_archive_entry(struct pakfire_file* file, int
 	// Set mode
 	archive_entry_set_mode(entry, pakfire_file_get_mode(file));
 
-	// Set user
-	archive_entry_set_uname(entry, pakfire_file_get_user(file));
+	// Set uname
+	archive_entry_set_uname(entry, pakfire_file_get_uname(file));
 
-	// Set group
-	archive_entry_set_gname(entry, pakfire_file_get_group(file));
+	// Set gname
+	archive_entry_set_gname(entry, pakfire_file_get_gname(file));
 
 	// Set times
 	archive_entry_set_ctime(entry, pakfire_file_get_ctime(file), 0);
@@ -499,7 +499,7 @@ char* pakfire_file_dump(struct pakfire_file* file) {
 
 	// Put everything together
 	r = asprintf(&buffer, "%s %s/%s %8zu %s %s",
-		mode, file->user, file->group, file->st.st_size, time, file->path);
+		mode, file->uname, file->gname, file->st.st_size, time, file->path);
 	if (r < 0)
 		return NULL;
 
@@ -611,20 +611,20 @@ PAKFIRE_EXPORT void pakfire_file_set_size(struct pakfire_file* file, off_t size)
 	file->st.st_size = size;
 }
 
-PAKFIRE_EXPORT const char* pakfire_file_get_user(struct pakfire_file* file) {
-	return file->user;
+PAKFIRE_EXPORT const char* pakfire_file_get_uname(struct pakfire_file* file) {
+	return file->uname;
 }
 
-PAKFIRE_EXPORT int pakfire_file_set_user(struct pakfire_file* file, const char* user) {
-	return pakfire_string_set(file->user, user);
+PAKFIRE_EXPORT int pakfire_file_set_uname(struct pakfire_file* file, const char* uname) {
+	return pakfire_string_set(file->uname, uname);
 }
 
-PAKFIRE_EXPORT const char* pakfire_file_get_group(struct pakfire_file* file) {
-	return file->group;
+PAKFIRE_EXPORT const char* pakfire_file_get_gname(struct pakfire_file* file) {
+	return file->gname;
 }
 
-PAKFIRE_EXPORT int pakfire_file_set_group(struct pakfire_file* file, const char* group) {
-	return pakfire_string_set(file->group, group);
+PAKFIRE_EXPORT int pakfire_file_set_gname(struct pakfire_file* file, const char* gname) {
+	return pakfire_string_set(file->gname, gname);
 }
 
 PAKFIRE_EXPORT mode_t pakfire_file_get_mode(struct pakfire_file* file) {
@@ -981,8 +981,8 @@ static int pakfire_file_verify_ownership(struct pakfire_file* file, const struct
 #endif
 
 	// Fetch owner & group
-	struct passwd* owner = pakfire_getpwnam(file->pakfire, file->user);
-	struct group*  group = pakfire_getgrnam(file->pakfire, file->group);
+	struct passwd* owner = pakfire_getpwnam(file->pakfire, file->uname);
+	struct group*  group = pakfire_getgrnam(file->pakfire, file->gname);
 
 	// Check if owner matches
 	if (!owner || owner->pw_uid != uid) {
diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h
index d626182ff..8cf176448 100644
--- a/src/libpakfire/include/pakfire/file.h
+++ b/src/libpakfire/include/pakfire/file.h
@@ -52,11 +52,11 @@ int pakfire_file_get_type(struct pakfire_file* file);
 ssize_t pakfire_file_get_size(struct pakfire_file* file);
 void pakfire_file_set_size(struct pakfire_file* file, ssize_t size);
 
-const char* pakfire_file_get_user(struct pakfire_file* file);
-int pakfire_file_set_user(struct pakfire_file* file, const char* user);
+const char* pakfire_file_get_uname(struct pakfire_file* file);
+int pakfire_file_set_uname(struct pakfire_file* file, const char* uname);
 
-const char* pakfire_file_get_group(struct pakfire_file* file);
-int pakfire_file_set_group(struct pakfire_file* file, const char* group);
+const char* pakfire_file_get_gname(struct pakfire_file* file);
+int pakfire_file_set_gname(struct pakfire_file* file, const char* gname);
 
 mode_t pakfire_file_get_mode(struct pakfire_file* file);
 void pakfire_file_set_mode(struct pakfire_file* file, mode_t mode);
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index b2b7de47d..c9073dc70 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -84,7 +84,7 @@ global:
 	pakfire_file_create;
 	pakfire_file_get_ctime;
 	pakfire_file_get_digest;
-	pakfire_file_get_group;
+	pakfire_file_get_gname;
 	pakfire_file_get_hexdigest;
 	pakfire_file_get_mode;
 	pakfire_file_get_mtime;
@@ -93,17 +93,17 @@ global:
 	pakfire_file_get_size;
 	pakfire_file_get_time;
 	pakfire_file_get_type;
-	pakfire_file_get_user;
+	pakfire_file_get_uname;
 	pakfire_file_set_ctime;
 	pakfire_file_set_digest;
-	pakfire_file_set_group;
+	pakfire_file_set_gname;
 	pakfire_file_set_mode;
 	pakfire_file_set_mtime;
 	pakfire_file_set_path;
 	pakfire_file_set_perms;
 	pakfire_file_set_size;
 	pakfire_file_set_time;
-	pakfire_file_set_user;
+	pakfire_file_set_uname;
 	pakfire_file_ref;
 	pakfire_file_unref;
 
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 1f8e54063..c85a18658 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -587,8 +587,8 @@ int pakfire_packager_add_file(struct pakfire_packager* packager, struct pakfire_
 		pakfire_file_set_perms(file, 0644);
 
 		// Reset file ownership
-		pakfire_file_set_user(file, "root");
-		pakfire_file_set_group(file, "root");
+		pakfire_file_set_uname(file, "root");
+		pakfire_file_set_gname(file, "root");
 	}
 
 	// Append the file to the filelist