New upstream version 2.3.3
This commit is contained in:
		
							parent
							
								
									21323d25dd
								
							
						
					
					
						commit
						e7bdd1c6c6
					
				
					 49 changed files with 13068 additions and 34075 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
# Makefile.in generated by automake 1.16.3 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.16.5 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 | 
			
		||||
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 | 
			
		||||
 | 
			
		||||
# This Makefile.in is free software; the Free Software Foundation
 | 
			
		||||
# gives unlimited permission to copy and/or distribute it,
 | 
			
		||||
| 
						 | 
				
			
			@ -293,8 +293,6 @@ am__define_uniq_tagged_files = \
 | 
			
		|||
  unique=`for i in $$list; do \
 | 
			
		||||
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 | 
			
		||||
  done | $(am__uniquify_input)`
 | 
			
		||||
ETAGS = etags
 | 
			
		||||
CTAGS = ctags
 | 
			
		||||
DIST_SUBDIRS = $(SUBDIRS)
 | 
			
		||||
am__DIST_COMMON = $(srcdir)/Makefile.in \
 | 
			
		||||
	$(top_srcdir)/build-aux/depcomp \
 | 
			
		||||
| 
						 | 
				
			
			@ -349,6 +347,8 @@ CCDEPMODE = @CCDEPMODE@
 | 
			
		|||
CFLAGS = @CFLAGS@
 | 
			
		||||
CPP = @CPP@
 | 
			
		||||
CPPFLAGS = @CPPFLAGS@
 | 
			
		||||
CSCOPE = @CSCOPE@
 | 
			
		||||
CTAGS = @CTAGS@
 | 
			
		||||
CYGPATH_W = @CYGPATH_W@
 | 
			
		||||
DBILIBS = @DBILIBS@
 | 
			
		||||
DEFS = @DEFS@
 | 
			
		||||
| 
						 | 
				
			
			@ -368,6 +368,7 @@ ENOLINK_VALUE = @ENOLINK_VALUE@
 | 
			
		|||
EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
 | 
			
		||||
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 | 
			
		||||
ERRNO_H = @ERRNO_H@
 | 
			
		||||
ETAGS = @ETAGS@
 | 
			
		||||
EXEEXT = @EXEEXT@
 | 
			
		||||
EXTRAS = @EXTRAS@
 | 
			
		||||
EXTRAS_ROOT = @EXTRAS_ROOT@
 | 
			
		||||
| 
						 | 
				
			
			@ -1660,7 +1661,6 @@ cscopelist-am: $(am__tagged_files)
 | 
			
		|||
 | 
			
		||||
distclean-tags:
 | 
			
		||||
	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 | 
			
		||||
 | 
			
		||||
distdir: $(BUILT_SOURCES)
 | 
			
		||||
	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
# Makefile.in generated by automake 1.16.3 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.16.5 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 | 
			
		||||
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 | 
			
		||||
 | 
			
		||||
# This Makefile.in is free software; the Free Software Foundation
 | 
			
		||||
# gives unlimited permission to copy and/or distribute it,
 | 
			
		||||
| 
						 | 
				
			
			@ -319,8 +319,6 @@ am__define_uniq_tagged_files = \
 | 
			
		|||
  unique=`for i in $$list; do \
 | 
			
		||||
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 | 
			
		||||
  done | $(am__uniquify_input)`
 | 
			
		||||
ETAGS = etags
 | 
			
		||||
CTAGS = ctags
 | 
			
		||||
am__tty_colors_dummy = \
 | 
			
		||||
  mgn= red= grn= lgn= blu= brg= std=; \
 | 
			
		||||
  am__color_tests=no
 | 
			
		||||
| 
						 | 
				
			
			@ -553,6 +551,8 @@ CCDEPMODE = @CCDEPMODE@
 | 
			
		|||
CFLAGS = @CFLAGS@
 | 
			
		||||
CPP = @CPP@
 | 
			
		||||
CPPFLAGS = @CPPFLAGS@
 | 
			
		||||
CSCOPE = @CSCOPE@
 | 
			
		||||
CTAGS = @CTAGS@
 | 
			
		||||
CYGPATH_W = @CYGPATH_W@
 | 
			
		||||
DBILIBS = @DBILIBS@
 | 
			
		||||
DEFS = @DEFS@
 | 
			
		||||
| 
						 | 
				
			
			@ -572,6 +572,7 @@ ENOLINK_VALUE = @ENOLINK_VALUE@
 | 
			
		|||
EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
 | 
			
		||||
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 | 
			
		||||
ERRNO_H = @ERRNO_H@
 | 
			
		||||
ETAGS = @ETAGS@
 | 
			
		||||
EXEEXT = @EXEEXT@
 | 
			
		||||
EXTRAS = @EXTRAS@
 | 
			
		||||
EXTRAS_ROOT = @EXTRAS_ROOT@
 | 
			
		||||
| 
						 | 
				
			
			@ -2038,7 +2039,6 @@ recheck: all $(check_PROGRAMS)
 | 
			
		|||
@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 | 
			
		||||
@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 | 
			
		||||
@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 | 
			
		||||
 | 
			
		||||
distdir: $(BUILT_SOURCES)
 | 
			
		||||
	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,6 +28,7 @@
 | 
			
		|||
 | 
			
		||||
#include "common.h"
 | 
			
		||||
#include "utils_disk.h"
 | 
			
		||||
#include "gl/fsusage.h"
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
np_add_name (struct name_list **list, const char *name)
 | 
			
		||||
| 
						 | 
				
			
			@ -127,9 +128,12 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
 | 
			
		|||
      size_t name_len = strlen(d->name);
 | 
			
		||||
      size_t best_match_len = 0;
 | 
			
		||||
      struct mount_entry *best_match = NULL;
 | 
			
		||||
      struct fs_usage fsp;
 | 
			
		||||
 | 
			
		||||
      /* set best match if path name exactly matches a mounted device name */
 | 
			
		||||
      for (me = mount_list; me; me = me->me_next) {
 | 
			
		||||
	if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
 | 
			
		||||
	  continue; /* skip if permissions do not suffice for accessing device */
 | 
			
		||||
        if (strcmp(me->me_devname, d->name)==0)
 | 
			
		||||
          best_match = me;
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			@ -137,6 +141,8 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
 | 
			
		|||
      /* set best match by directory name if no match was found by devname */
 | 
			
		||||
      if (! best_match) {
 | 
			
		||||
        for (me = mount_list; me; me = me->me_next) {
 | 
			
		||||
	  if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
 | 
			
		||||
	    continue; /* skip if permissions do not suffice for accessing device */
 | 
			
		||||
          size_t len = strlen (me->me_mountdir);
 | 
			
		||||
          if ((exact == FALSE && (best_match_len <= len && len <= name_len &&
 | 
			
		||||
             (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0)))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue