revert the tweaked nsr-tandem-nsk port for now, pending further comment
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1680 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
ce364e2a57
commit
8911e235ba
|
@ -30,8 +30,6 @@ CVS code -
|
||||||
Add function init_backup_dir() to handle relative paths
|
Add function init_backup_dir() to handle relative paths
|
||||||
correctly, use get_full_path() to get the canonical pathname,
|
correctly, use get_full_path() to get the canonical pathname,
|
||||||
and use tail() to get the filename if get_full_path() fails.
|
and use tail() to get the filename if get_full_path() fails.
|
||||||
- Port to the Tandem NonStop Kernel (nsr-tandem-nsk). (Tom
|
|
||||||
Bates; minor tweaks by DLR)
|
|
||||||
- files.c:
|
- files.c:
|
||||||
add_open_files()
|
add_open_files()
|
||||||
- Make the saving of marked status in open_files->file_flags
|
- Make the saving of marked status in open_files->file_flags
|
||||||
|
|
|
@ -19,11 +19,6 @@
|
||||||
* *
|
* *
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
#ifdef __TANDEM
|
|
||||||
/* Tandem NonStop Kernel */
|
|
||||||
#include <floss.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -3178,7 +3173,7 @@ int main(int argc, char *argv[])
|
||||||
#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
|
#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
|
||||||
/* if we don't have rcfile support, we're root, and
|
/* if we don't have rcfile support, we're root, and
|
||||||
--disable-wrapping-as-root is used, turn wrapping off */
|
--disable-wrapping-as-root is used, turn wrapping off */
|
||||||
if (geteuid() == NANO_ROOT_UID)
|
if (geteuid() == 0)
|
||||||
SET(NO_WRAP);
|
SET(NO_WRAP);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -3420,7 +3415,7 @@ int main(int argc, char *argv[])
|
||||||
flags |= flags_cpy;
|
flags |= flags_cpy;
|
||||||
}
|
}
|
||||||
#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
|
#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
|
||||||
else if (geteuid() == NANO_ROOT_UID)
|
else if (geteuid() == 0)
|
||||||
SET(NO_WRAP);
|
SET(NO_WRAP);
|
||||||
#endif
|
#endif
|
||||||
#endif /* ENABLE_NANORC */
|
#endif /* ENABLE_NANORC */
|
||||||
|
|
|
@ -22,13 +22,6 @@
|
||||||
#ifndef NANO_H
|
#ifndef NANO_H
|
||||||
#define NANO_H 1
|
#define NANO_H 1
|
||||||
|
|
||||||
#ifdef __TANDEM
|
|
||||||
/* Tandem NonStop Kernel */
|
|
||||||
#define NANO_ROOT_UID 65535
|
|
||||||
#else
|
|
||||||
#define NANO_ROOT_UID 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_LIMITS_H
|
#ifdef HAVE_LIMITS_H
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -678,7 +678,7 @@ void do_rcfile(void)
|
||||||
#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
|
#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
|
||||||
/* If we've already read SYSCONFDIR/nanorc (if it's there), we're
|
/* If we've already read SYSCONFDIR/nanorc (if it's there), we're
|
||||||
root, and --disable-wrapping-as-root is used, turn wrapping off */
|
root, and --disable-wrapping-as-root is used, turn wrapping off */
|
||||||
if (euid == NANO_ROOT_UID)
|
if (euid == 0)
|
||||||
SET(NO_WRAP);
|
SET(NO_WRAP);
|
||||||
#endif
|
#endif
|
||||||
if ((rcstream = fopen(nanorc, "r")) == NULL) {
|
if ((rcstream = fopen(nanorc, "r")) == NULL) {
|
||||||
|
|
Loading…
Reference in New Issue