aniani/gophernicus
1
0
Fork 0
mirror of https://github.com/gophernicus/gophernicus.git synced 2024-06-16 06:25:23 +00:00
Code

Sort the ~ selector by date modified

Browse Source 
When a gopherer comes in contact with a user listing, the current
order is pretty much useless (by UID). It makes much more sense
to sort by the date modified.

Closes #62
This commit is contained in:
fosslinux 2020-04-28 15:46:49 +10:00
parent e2dc5d9337
commit ca3b8a8ce4
No known key found for this signature in database
GPG Key ID: 7D7996D0C25B63A3
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gophernicus.h
View File

@ -259,7 +259,7 @@ size_t strlcat(char *dst, const char *src, size_t siz);
#define DATE_WIDTH 17
#define DATE_LOCALE "POSIX"
#define USERDIR_FORMAT "~%s", pwd->pw_name /* See man 3 getpwent */
#define USERDIR_FORMAT "~%s", users[i].user /* See man 3 getpwent */
#define VHOST_FORMAT "gopher://%s/"
/* ISO-8859-1 to US-ASCII look-alike conversion table */
@ -282,6 +282,7 @@ size_t strlcat(char *dst, const char *src, size_t siz);
#define MAX_FILTERS 16 /* Maximum number of file filters */
#define MAX_SDIRENT 1024 /* Maximum number of files per directory to handle */
#define MAX_REWRITE 32 /* Maximum number of selector rewrite options */
#define MAX_USERS 1024 /* Maximum number of users for the ~ option */
/* Struct for file suffix -> gopher filetype mapping */
typedef struct {
@ -415,6 +416,12 @@ typedef struct {
time_t mtime;
} sdirent;
/* Struct for the userlist with date */
typedef struct {
char user[32]; /* Maximum in most systems */
time_t mtime;
} user_date;
/*
* Useful macros
*/

36
src/menu.c
View File

@ -48,6 +48,16 @@ int foldersort(const void *a, const void *b)
}
/*
* Date sort for userlist()
*/
int datesort(const void *a, const void *b)
{
if (((user_date *)a)->mtime > ((user_date *)b)->mtime) return -1;
else return 1;
}
/*
* Scan, stat and sort a directory folders first (scandir replacement)
*/
@ -99,6 +109,7 @@ void userlist(state *st)
struct passwd *pwd;
struct stat dir;
char buf[BUFSIZE];
user_date users[MAX_USERS];
struct tm *ltime;
char timestr[20];
int width;
@ -108,6 +119,7 @@ void userlist(state *st)
/* Loop through all users */
setpwent();
int i = 0;
while ((pwd = getpwent())) {
/* Skip too small uids */
@ -120,18 +132,36 @@ void userlist(state *st)
if (dir.st_uid != pwd->pw_uid) continue;
/* Found one */
strcpy(users[i].user, pwd->pw_name);
users[i].mtime = dir.st_mtime;
i++;
}
/* Sort by date */
int true_length = 0;
while((users[true_length].user[0] != '\0') && (true_length < MAX_USERS)) true_length++;
qsort((void*)users, true_length, sizeof(users[0]), datesort);
/* Loop over the found users */
for(
i = 0;
((i < MAX_USERS) && (users[i].user[0] != '\0'));
i++)
{
/* Format the user string */
snprintf(buf, sizeof(buf), USERDIR_FORMAT);
/* Output */
if (st->opt_date) {
ltime = localtime(&dir.st_mtime);
ltime = localtime(&users[i].mtime);
strftime(timestr, sizeof(timestr), DATE_FORMAT, ltime);
printf("1%-*.*s %s - \t/~%s/\t%s\t%i" CRLF,
width, width, buf, timestr, pwd->pw_name,
width, width, buf, timestr, users[i].user,
st->server_host, st->server_port);
}
else {
printf("1%.*s\t/~%s/\t%s\t%i" CRLF, st->out_width, buf,
printf("1%.*s\t/~%s/\t%s\t%i" CRLF, st->out_width, users[i].user,
pwd->pw_name, st->server_host_default, st->server_port);
}
}