diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
| commit | 650c20f1ca4e07591a727e1cfcc74b3363d15985 (patch) | |
| tree | 85d11f6437cde22f410c25e0e5f71a3131ebd07d /lib/filemode.c | |
| parent | 8869332684c2302b5ba1ead4568bbc7ba1c0183e (diff) | |
| parent | 4b85ae6a24380fb67a3315eaec9233f17a872473 (diff) | |
| download | emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.gz emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.bz2 emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.zip | |
Merge 'master' into noverlay
Diffstat (limited to 'lib/filemode.c')
| -rw-r--r-- | lib/filemode.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/filemode.c b/lib/filemode.c index c6cf1f3196c..a8cbea844c8 100644 --- a/lib/filemode.c +++ b/lib/filemode.c @@ -1,11 +1,11 @@ /* filemode.c -- make a string describing file modes - Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2017 Free + Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2022 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,17 +20,6 @@ #include "filemode.h" -/* The following is for Cray DMF (Data Migration Facility), which is a - HSM file system. A migrated file has a 'st_dm_mode' that is - different from the normal 'st_mode', so any tests for migrated - files should use the former. */ -#if HAVE_ST_DM_MODE -# define IS_MIGRATED_FILE(statp) \ - (S_ISOFD (statp->st_dm_mode) || S_ISOFL (statp->st_dm_mode)) -#else -# define IS_MIGRATED_FILE(statp) 0 -#endif - #if ! HAVE_DECL_STRMODE /* Return a character indicating the type of file described by @@ -126,7 +115,6 @@ strmode (mode_t mode, char *str) for files whose type cannot be determined solely from st_mode: 'F' semaphore - 'M' migrated file (Cray DMF) 'Q' message queue 'S' shared memory object 'T' typed memory object @@ -169,8 +157,6 @@ filemodestring (struct stat const *statp, char *str) if (S_TYPEISSEM (statp)) str[0] = 'F'; - else if (IS_MIGRATED_FILE (statp)) - str[0] = 'M'; else if (S_TYPEISMQ (statp)) str[0] = 'Q'; else if (S_TYPEISSHM (statp)) |