Commit 1216f153 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

next/priv directory: Use PATH_MAX instead of FEH_MAX_DIRNAME_LEN

parent 8f1f369b

src/filelist.c

+3 −3
Original line number Diff line number Diff line
@@ -409,10 +409,10 @@ int feh_cmp_name(void *file1, void *file2) 


int feh_cmp_dirname(void *file1, void *file2)

{

	char dir1[FEH_MAX_DIRNAME_LEN], dir2[FEH_MAX_DIRNAME_LEN];

	char dir1[PATH_MAX], dir2[PATH_MAX];

	int cmp;

	feh_file_dirname(dir1, FEH_FILE(file1), FEH_MAX_DIRNAME_LEN);

	feh_file_dirname(dir2, FEH_FILE(file2), FEH_MAX_DIRNAME_LEN);

	feh_file_dirname(dir1, FEH_FILE(file1), PATH_MAX);

	feh_file_dirname(dir2, FEH_FILE(file2), PATH_MAX);

	if ((cmp = strcmp(dir1, dir2)) != 0)

		return(cmp);

	return(feh_cmp_name(file1, file2));

src/filelist.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct __feh_file_info { 
};



#define FEH_FILE(l) ((feh_file *) l)

#define FEH_MAX_DIRNAME_LEN 4096



/*

 * PATH_MAX may not be defined on all systems. Since we only use it in for a

src/slideshow.c

+6 −6
Original line number Diff line number Diff line
@@ -324,14 +324,14 @@ void slideshow_change_image(winwidget winwid, int change, int render) 
			break;

		case SLIDE_JUMP_NEXT_DIR:

			{

				char old_dir[FEH_MAX_DIRNAME_LEN], new_dir[FEH_MAX_DIRNAME_LEN];

				char old_dir[PATH_MAX], new_dir[PATH_MAX];

				int j;



				feh_file_dirname(old_dir, FEH_FILE(current_file->data), FEH_MAX_DIRNAME_LEN);

				feh_file_dirname(old_dir, FEH_FILE(current_file->data), PATH_MAX);



				for (j = 0; j < our_filelist_len; j++) {

					current_file = feh_list_jump(filelist, current_file, FORWARD, 1);

					feh_file_dirname(new_dir, FEH_FILE(current_file->data), FEH_MAX_DIRNAME_LEN);

					feh_file_dirname(new_dir, FEH_FILE(current_file->data), PATH_MAX);

					if (strcmp(old_dir, new_dir) != 0)

						break;

				}
@@ -340,17 +340,17 @@ void slideshow_change_image(winwidget winwid, int change, int render) 
			break;

		case SLIDE_JUMP_PREV_DIR:

			{

				char old_dir[FEH_MAX_DIRNAME_LEN], new_dir[FEH_MAX_DIRNAME_LEN];

				char old_dir[PATH_MAX], new_dir[PATH_MAX];

				int j;



				/* Start the search from the previous file in case we are on

				   the first file of a directory */

				current_file = feh_list_jump(filelist, current_file, BACK, 1);

				feh_file_dirname(old_dir, FEH_FILE(current_file->data), FEH_MAX_DIRNAME_LEN);

				feh_file_dirname(old_dir, FEH_FILE(current_file->data), PATH_MAX);



				for (j = 0; j < our_filelist_len; j++) {

					current_file = feh_list_jump(filelist, current_file, BACK, 1);

					feh_file_dirname(new_dir, FEH_FILE(current_file->data), FEH_MAX_DIRNAME_LEN);

					feh_file_dirname(new_dir, FEH_FILE(current_file->data), PATH_MAX);

					if (strcmp(old_dir, new_dir) != 0)

						break;

				}