Mercurial > octave
changeset 30072:96a40641d86e
maint: rename liboctave oct-passwd.* to oct-password.* to match class name.
* oct-password.cc: Renamed from oct-passwd.cc
* oct-password.h: Renamed from oct-passwd.h
* liboctave/system/module.mk: Update build system with new names.
* getpwent.cc, file-ops.cc, oct-env.cc, kpse.cc:
Update #include statements to use new name "oct-password.h"
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 30 Aug 2021 09:02:23 -0700 |
| parents | 11bda5cb45b5 |
| children | 1e277c6b6626 |
| files | libinterp/corefcn/getpwent.cc liboctave/system/file-ops.cc liboctave/system/module.mk liboctave/system/oct-env.cc liboctave/system/oct-passwd.cc liboctave/system/oct-passwd.h liboctave/system/oct-password.cc liboctave/system/oct-password.h liboctave/util/kpse.cc |
| diffstat | 9 files changed, 392 insertions(+), 392 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/getpwent.cc Mon Aug 30 08:14:42 2021 -0700 +++ b/libinterp/corefcn/getpwent.cc Mon Aug 30 09:02:23 2021 -0700 @@ -31,7 +31,7 @@ #include <sys/types.h> -#include "oct-passwd.h" +#include "oct-password.h" #include "defun.h" #include "error.h"
--- a/liboctave/system/file-ops.cc Mon Aug 30 08:14:42 2021 -0700 +++ b/liboctave/system/file-ops.cc Mon Aug 30 09:02:23 2021 -0700 @@ -49,7 +49,7 @@ #include "lo-sysdep.h" #include "oct-env.h" #include "oct-locbuf.h" -#include "oct-passwd.h" +#include "oct-password.h" #include "quit.h" #include "stat-wrappers.h" #include "str-vec.h"
--- a/liboctave/system/module.mk Mon Aug 30 08:14:42 2021 -0700 +++ b/liboctave/system/module.mk Mon Aug 30 09:02:23 2021 -0700 @@ -8,7 +8,7 @@ %reldir%/mach-info.h \ %reldir%/oct-env.h \ %reldir%/oct-group.h \ - %reldir%/oct-passwd.h \ + %reldir%/oct-password.h \ %reldir%/oct-syscalls.h \ %reldir%/oct-time.h \ %reldir%/oct-uname.h @@ -24,7 +24,7 @@ %reldir%/mach-info.cc \ %reldir%/oct-env.cc \ %reldir%/oct-group.cc \ - %reldir%/oct-passwd.cc \ + %reldir%/oct-password.cc \ %reldir%/oct-syscalls.cc \ %reldir%/oct-time.cc \ %reldir%/oct-uname.cc
--- a/liboctave/system/oct-env.cc Mon Aug 30 08:14:42 2021 -0700 +++ b/liboctave/system/oct-env.cc Mon Aug 30 09:02:23 2021 -0700 @@ -54,7 +54,7 @@ #include "lo-sysdep.h" #include "lo-utils.h" #include "oct-env.h" -#include "oct-passwd.h" +#include "oct-password.h" #include "oct-syscalls.h" #include "set-program-name-wrapper.h" #include "singleton-cleanup.h"
--- a/liboctave/system/oct-passwd.cc Mon Aug 30 08:14:42 2021 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,245 +0,0 @@ -//////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 1996-2021 The Octave Project Developers -// -// See the file COPYRIGHT.md in the top-level directory of this -// distribution or <https://octave.org/copyright/>. -// -// This file is part of Octave. -// -// Octave 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 -// (at your option) any later version. -// -// Octave is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Octave; see the file COPYING. If not, see -// <https://www.gnu.org/licenses/>. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (HAVE_CONFIG_H) -# include "config.h" -#endif - -#include <sys/types.h> - -#if defined (HAVE_PWD_H) -# include <pwd.h> -#endif - -#include "lo-error.h" -#include "oct-passwd.h" - -#define NOT_SUPPORTED(nm) \ - nm ": not supported on this system" - -OCTAVE_NORETURN static -void -err_invalid (void) -{ - (*current_liboctave_error_handler) ("invalid password object"); -} - -namespace octave -{ - namespace sys - { - std::string - password::name (void) const - { - if (! ok ()) - err_invalid (); - - return m_name; - } - - std::string - password::passwd (void) const - { - if (! ok ()) - err_invalid (); - - return m_passwd; - } - - uid_t - password::uid (void) const - { - if (! ok ()) - err_invalid (); - - return m_uid; - } - - gid_t - password::gid (void) const - { - if (! ok ()) - err_invalid (); - - return m_gid; - } - - std::string - password::gecos (void) const - { - if (! ok ()) - err_invalid (); - - return m_gecos; - } - - std::string - password::dir (void) const - { - if (! ok ()) - err_invalid (); - - return m_dir; - } - - std::string - password::shell (void) const - { - if (! ok ()) - err_invalid (); - - return m_shell; - } - - password - password::getpwent (void) - { - std::string msg; - return getpwent (msg); - } - - password - password::getpwent (std::string& msg) - { -#if defined HAVE_GETPWENT - msg = ""; - return password (::getpwent (), msg); -#else - msg = NOT_SUPPORTED ("getpwent"); - return password (); -#endif - } - - password - password::getpwuid (uid_t uid) - { - std::string msg; - return getpwuid (uid, msg); - } - - password - password::getpwuid (uid_t uid, std::string& msg) - { -#if defined (HAVE_GETPWUID) - msg = ""; - return password (::getpwuid (uid), msg); -#else - octave_unused_parameter (uid); - - msg = NOT_SUPPORTED ("getpwuid"); - return password (); -#endif - } - - password - password::getpwnam (const std::string& nm) - { - std::string msg; - return getpwnam (nm, msg); - } - - password - password::getpwnam (const std::string& nm, std::string& msg) - { -#if defined (HAVE_GETPWNAM) - msg = ""; - return password (::getpwnam (nm.c_str ()), msg); -#else - octave_unused_parameter (nm); - - msg = NOT_SUPPORTED ("getpwnam"); - return password (); -#endif - } - - int - password::setpwent (void) - { - std::string msg; - return setpwent (msg); - } - - int - password::setpwent (std::string& msg) - { -#if defined (HAVE_SETPWENT) - msg = ""; - ::setpwent (); - return 0; -#else - msg = NOT_SUPPORTED ("setpwent"); - return -1; -#endif - } - - int - password::endpwent (void) - { - std::string msg; - return endpwent (msg); - } - - int - password::endpwent (std::string& msg) - { -#if defined (HAVE_ENDPWENT) - msg = ""; - ::endpwent (); - return 0; -#else - msg = NOT_SUPPORTED ("endpwent"); - return -1; -#endif - } - - password::password (void *p, std::string& msg) - : m_name (), m_passwd (), m_uid (0), m_gid (0), m_gecos (), - m_dir (), m_shell (), m_valid (false) - { -#if defined (HAVE_PWD_H) - msg = ""; - - if (p) - { - struct ::passwd *pw = static_cast<struct ::passwd *> (p); - - m_name = pw->pw_name; - m_passwd = pw->pw_passwd; - m_uid = pw->pw_uid; - m_gid = pw->pw_gid; - m_gecos = pw->pw_gecos; - m_dir = pw->pw_dir; - m_shell = pw->pw_shell; - - m_valid = true; - } -#else - octave_unused_parameter (p); - - msg = NOT_SUPPORTED ("password functions"); -#endif - } - } -}
--- a/liboctave/system/oct-passwd.h Mon Aug 30 08:14:42 2021 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -//////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 1996-2021 The Octave Project Developers -// -// See the file COPYRIGHT.md in the top-level directory of this -// distribution or <https://octave.org/copyright/>. -// -// This file is part of Octave. -// -// Octave 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 -// (at your option) any later version. -// -// Octave is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Octave; see the file COPYING. If not, see -// <https://www.gnu.org/licenses/>. -// -//////////////////////////////////////////////////////////////////////// - -#if ! defined (octave_oct_passwd_h) -#define octave_oct_passwd_h 1 - -#include "octave-config.h" - -#include <string> - -#include <sys/types.h> - -namespace octave -{ - namespace sys - { - class - OCTAVE_API - password - { - public: - - password (void) - : m_name (), m_passwd (), m_uid (0), m_gid (0), m_gecos (), - m_dir (), m_shell (), m_valid (false) - { } - - password (const password& pw) - : m_name (pw.m_name), m_passwd (pw.m_passwd), - m_uid (pw.m_uid), m_gid (pw.m_gid), m_gecos (pw.m_gecos), - m_dir (pw.m_dir), m_shell (pw.m_shell), m_valid (pw.m_valid) - { } - - password& operator = (const password& pw) - { - if (this != &pw) - { - m_name = pw.m_name; - m_passwd = pw.m_passwd; - m_uid = pw.m_uid; - m_gid = pw.m_gid; - m_gecos = pw.m_gecos; - m_dir = pw.m_dir; - m_shell = pw.m_shell; - m_valid = pw.m_valid; - } - - return *this; - } - - ~password (void) = default; - - std::string name (void) const; - - std::string passwd (void) const; - - uid_t uid (void) const; - - gid_t gid (void) const; - - std::string gecos (void) const; - - std::string dir (void) const; - - std::string shell (void) const; - - bool ok (void) const { return m_valid; } - - operator bool () const { return ok (); } - - static password getpwent (void); - static password getpwent (std::string& msg); - - static password getpwuid (uid_t uid); - static password getpwuid (uid_t uid, std::string& msg); - - static password getpwnam (const std::string& nm); - static password getpwnam (const std::string& nm, std::string& msg); - - static int setpwent (void); - static int setpwent (std::string& msg); - - static int endpwent (void); - static int endpwent (std::string& msg); - - private: - - // User name. - std::string m_name; - - // Encrypted password. - std::string m_passwd; - - // Numeric user id. - uid_t m_uid; - - // Numeric group id. - gid_t m_gid; - - // Miscellaneous junk. - std::string m_gecos; - - // Home directory. - std::string m_dir; - - // Login shell. - std::string m_shell; - - // Flag that says whether we have been properly initialized. - bool m_valid; - - // This is how we will create a password object from a pointer - // to a struct passwd. - password (void *p, std::string& msg); - }; - } -} - -#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liboctave/system/oct-password.cc Mon Aug 30 09:02:23 2021 -0700 @@ -0,0 +1,245 @@ +//////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 1996-2021 The Octave Project Developers +// +// See the file COPYRIGHT.md in the top-level directory of this +// distribution or <https://octave.org/copyright/>. +// +// This file is part of Octave. +// +// Octave 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 +// (at your option) any later version. +// +// Octave is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Octave; see the file COPYING. If not, see +// <https://www.gnu.org/licenses/>. +// +//////////////////////////////////////////////////////////////////////// + +#if defined (HAVE_CONFIG_H) +# include "config.h" +#endif + +#include <sys/types.h> + +#if defined (HAVE_PWD_H) +# include <pwd.h> +#endif + +#include "lo-error.h" +#include "oct-password.h" + +#define NOT_SUPPORTED(nm) \ + nm ": not supported on this system" + +OCTAVE_NORETURN static +void +err_invalid (void) +{ + (*current_liboctave_error_handler) ("invalid password object"); +} + +namespace octave +{ + namespace sys + { + std::string + password::name (void) const + { + if (! ok ()) + err_invalid (); + + return m_name; + } + + std::string + password::passwd (void) const + { + if (! ok ()) + err_invalid (); + + return m_passwd; + } + + uid_t + password::uid (void) const + { + if (! ok ()) + err_invalid (); + + return m_uid; + } + + gid_t + password::gid (void) const + { + if (! ok ()) + err_invalid (); + + return m_gid; + } + + std::string + password::gecos (void) const + { + if (! ok ()) + err_invalid (); + + return m_gecos; + } + + std::string + password::dir (void) const + { + if (! ok ()) + err_invalid (); + + return m_dir; + } + + std::string + password::shell (void) const + { + if (! ok ()) + err_invalid (); + + return m_shell; + } + + password + password::getpwent (void) + { + std::string msg; + return getpwent (msg); + } + + password + password::getpwent (std::string& msg) + { +#if defined HAVE_GETPWENT + msg = ""; + return password (::getpwent (), msg); +#else + msg = NOT_SUPPORTED ("getpwent"); + return password (); +#endif + } + + password + password::getpwuid (uid_t uid) + { + std::string msg; + return getpwuid (uid, msg); + } + + password + password::getpwuid (uid_t uid, std::string& msg) + { +#if defined (HAVE_GETPWUID) + msg = ""; + return password (::getpwuid (uid), msg); +#else + octave_unused_parameter (uid); + + msg = NOT_SUPPORTED ("getpwuid"); + return password (); +#endif + } + + password + password::getpwnam (const std::string& nm) + { + std::string msg; + return getpwnam (nm, msg); + } + + password + password::getpwnam (const std::string& nm, std::string& msg) + { +#if defined (HAVE_GETPWNAM) + msg = ""; + return password (::getpwnam (nm.c_str ()), msg); +#else + octave_unused_parameter (nm); + + msg = NOT_SUPPORTED ("getpwnam"); + return password (); +#endif + } + + int + password::setpwent (void) + { + std::string msg; + return setpwent (msg); + } + + int + password::setpwent (std::string& msg) + { +#if defined (HAVE_SETPWENT) + msg = ""; + ::setpwent (); + return 0; +#else + msg = NOT_SUPPORTED ("setpwent"); + return -1; +#endif + } + + int + password::endpwent (void) + { + std::string msg; + return endpwent (msg); + } + + int + password::endpwent (std::string& msg) + { +#if defined (HAVE_ENDPWENT) + msg = ""; + ::endpwent (); + return 0; +#else + msg = NOT_SUPPORTED ("endpwent"); + return -1; +#endif + } + + password::password (void *p, std::string& msg) + : m_name (), m_passwd (), m_uid (0), m_gid (0), m_gecos (), + m_dir (), m_shell (), m_valid (false) + { +#if defined (HAVE_PWD_H) + msg = ""; + + if (p) + { + struct ::passwd *pw = static_cast<struct ::passwd *> (p); + + m_name = pw->pw_name; + m_passwd = pw->pw_passwd; + m_uid = pw->pw_uid; + m_gid = pw->pw_gid; + m_gecos = pw->pw_gecos; + m_dir = pw->pw_dir; + m_shell = pw->pw_shell; + + m_valid = true; + } +#else + octave_unused_parameter (p); + + msg = NOT_SUPPORTED ("password functions"); +#endif + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liboctave/system/oct-password.h Mon Aug 30 09:02:23 2021 -0700 @@ -0,0 +1,141 @@ +//////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 1996-2021 The Octave Project Developers +// +// See the file COPYRIGHT.md in the top-level directory of this +// distribution or <https://octave.org/copyright/>. +// +// This file is part of Octave. +// +// Octave 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 +// (at your option) any later version. +// +// Octave is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Octave; see the file COPYING. If not, see +// <https://www.gnu.org/licenses/>. +// +//////////////////////////////////////////////////////////////////////// + +#if ! defined (octave_oct_passwd_h) +#define octave_oct_passwd_h 1 + +#include "octave-config.h" + +#include <string> + +#include <sys/types.h> + +namespace octave +{ + namespace sys + { + class + OCTAVE_API + password + { + public: + + password (void) + : m_name (), m_passwd (), m_uid (0), m_gid (0), m_gecos (), + m_dir (), m_shell (), m_valid (false) + { } + + password (const password& pw) + : m_name (pw.m_name), m_passwd (pw.m_passwd), + m_uid (pw.m_uid), m_gid (pw.m_gid), m_gecos (pw.m_gecos), + m_dir (pw.m_dir), m_shell (pw.m_shell), m_valid (pw.m_valid) + { } + + password& operator = (const password& pw) + { + if (this != &pw) + { + m_name = pw.m_name; + m_passwd = pw.m_passwd; + m_uid = pw.m_uid; + m_gid = pw.m_gid; + m_gecos = pw.m_gecos; + m_dir = pw.m_dir; + m_shell = pw.m_shell; + m_valid = pw.m_valid; + } + + return *this; + } + + ~password (void) = default; + + std::string name (void) const; + + std::string passwd (void) const; + + uid_t uid (void) const; + + gid_t gid (void) const; + + std::string gecos (void) const; + + std::string dir (void) const; + + std::string shell (void) const; + + bool ok (void) const { return m_valid; } + + operator bool () const { return ok (); } + + static password getpwent (void); + static password getpwent (std::string& msg); + + static password getpwuid (uid_t uid); + static password getpwuid (uid_t uid, std::string& msg); + + static password getpwnam (const std::string& nm); + static password getpwnam (const std::string& nm, std::string& msg); + + static int setpwent (void); + static int setpwent (std::string& msg); + + static int endpwent (void); + static int endpwent (std::string& msg); + + private: + + // User name. + std::string m_name; + + // Encrypted password. + std::string m_passwd; + + // Numeric user id. + uid_t m_uid; + + // Numeric group id. + gid_t m_gid; + + // Miscellaneous junk. + std::string m_gecos; + + // Home directory. + std::string m_dir; + + // Login shell. + std::string m_shell; + + // Flag that says whether we have been properly initialized. + bool m_valid; + + // This is how we will create a password object from a pointer + // to a struct passwd. + password (void *p, std::string& msg); + }; + } +} + +#endif
--- a/liboctave/util/kpse.cc Mon Aug 30 08:14:42 2021 -0700 +++ b/liboctave/util/kpse.cc Mon Aug 30 09:02:23 2021 -0700 @@ -46,7 +46,7 @@ #include "file-stat.h" #include "kpse.h" #include "oct-env.h" -#include "oct-passwd.h" +#include "oct-password.h" #include "oct-time.h" #include "pathsearch.h" #include "unistd-wrappers.h"