Mercurial > hg > octave-nkf
view liboctave/oct-passwd.cc @ 13983:7dd7cccf0757
clean up memory allocated for singletons before exit
* singleton-cleanup.h, singleton-cleanup.cc: New files.
* liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES):
Add them to the lists.
* toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup.
* debug.h, debug.cc (bp_table::instance_ok): Move definition to
debug.cc.
* coment-list.h (octave_comment_buffer::~octave_comment_buffer):
Define destructor for class.
* ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo):
Likewise.
* cmd-edit.h (command_editor::cleanup_instance): New function.
* cmd-hist.h (command_history::cleanup_instance): New function.
* file-ops.h (file_ops::cleanup_instance): New function.
* mach-info.h (oct_mach_info::cleanup_instance): New function.
* oct-env.h (octave_env::cleanup_instance): New function.
* oct-fftw.h (octave_fftw_planner::cleanup_instance): New function.
* oct-rand.h (octave_rand::cleanup_instance): New function.
* oct-spparms.h (octave_sparse_params::cleanup_instance):
New function.
* pathsearch.h (static_members::cleanup_instance): New function.
* comment-list.h (octave_comment_buffer::cleanup_instance):
New function.
* debug.h (bp_table::cleanup_instance): New function.
* display.h (display_info::cleanup_instance): New function.
* dynamic-ld.cc (octave_shlib_list::cleanup_instance,
octave_mex_file_list::cleanup_instance): New functions.
* dynamic-ld.h (octave_dynamic_loader::cleanup_instance):
New function.
* load-path.h (load_path::cleanup_instance): New function.
* oct-stream.h (octave_stream_list::cleanup_instance): New function.
* ov-typeinfo.h (octave_value_typeinfo::cleanup_instance):
New function.
* pager.h, pager.cc (octave_pager_stream::instance_ok,
octave_pager_stream::cleanup_instance): New functions.
(octave_diary_stream::instance_ok,
octave_diary_stream::cleanup_instance): New functions.
* sighandlers.h (octave_child_list::cleanup_instance): New function.
* toplev.h (octave_call_stack
* pager.cc (octave_pager_stream::stream, octave_diary_stream::stream):
Use instance_ok to create instance.
* toplev.h (octave_call_stack::cleanup_instance): New function.
* cmd-edit.cc (command_editor::instance_ok):
Register cleanup function.
* cmd-hist.cc (command_history::instance_ok): Likewise.
* file-ops.cc (file_ops::instance_ok): Likewise.
* mach-info.cc (oct_mach_info::instance_ok): Likewise.
* oct-env.cc (octave_env::instance_ok): Likewise.
* oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise.
* oct-rand.cc (octave_rand::instance_ok): Likewise.
* oct-spparms.cc (octave_sparse_params::instance_ok): Likewise.
* pathsearch.cc (dir_path::static_members::instance_ok): Likewise.
* comment-list.cc (comment_list::instance_ok): Likewise.
* debug.cc (bp_table::instance_ok): Likewise.
* display.cc (display_info::instance_ok): Likewise.
* dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise.
* load-path.cc (load_path::instance_ok): Likewise.
* oct-stream.cc (octave_stream_list::instance_ok): Likewise.
* ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise.
* sighandlers.cc (octave_child_list::instance_ok): Likewise.
* symtab.h, symtab.cc (symbol_table::scope_id::create_instance):
New function.
* symtab.h (symbol_table::scope_id::instance_ok): Call create_instance.
* toplev.h, toplev.cc (octave_call_stack::create_instance):
New function.
* toplev.cc (octave_call_stack::instance_ok): Call create_instance.
* pager.h, pager.cc (octave_pager_stream::set_diary_skip,
octave_pager_stream::flush_current_contents_to_diary): Now static.
octave_pager_stream::do_set_diary_skip,
octave_pager_stream::do_flush_current_contents_to_diary):
New functions.
(octave_pager_stream::stream): Return std::ostream&, not
octave_pager_stream&. If instance creation fails, return std::cout.
(octave_diary_stream::stream): Return std::ostream&, not
octave_diary_stream&. If instance creation fails, return std::cout.
(octave_pager_stream::do_reset, octave_diary_stream::do_reset):
Use instance_ok to create instance.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 03 Dec 2011 04:34:17 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1996-2011 John W. Eaton 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 <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <sys/types.h> #ifdef 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" std::string octave_passwd::name (void) const { if (! ok ()) gripe_invalid (); return pw_name; } std::string octave_passwd::passwd (void) const { if (! ok ()) gripe_invalid (); return pw_passwd; } uid_t octave_passwd::uid (void) const { if (! ok ()) gripe_invalid (); return pw_uid; } gid_t octave_passwd::gid (void) const { if (! ok ()) gripe_invalid (); return pw_gid; } std::string octave_passwd::gecos (void) const { if (! ok ()) gripe_invalid (); return pw_gecos; } std::string octave_passwd::dir (void) const { if (! ok ()) gripe_invalid (); return pw_dir; } std::string octave_passwd::shell (void) const { if (! ok ()) gripe_invalid (); return pw_shell; } octave_passwd octave_passwd::getpwent (void) { std::string msg; return getpwent (msg); } octave_passwd octave_passwd::getpwent (std::string& msg) { #if defined HAVE_GETPWENT msg = std::string (); return octave_passwd (::getpwent (), msg); #else msg = NOT_SUPPORTED ("getpwent"); return octave_passwd (); #endif } octave_passwd octave_passwd::getpwuid (uid_t uid) { std::string msg; return getpwuid (uid, msg); } octave_passwd octave_passwd::getpwuid (uid_t uid, std::string& msg) { #if defined (HAVE_GETPWUID) msg = std::string (); return octave_passwd (::getpwuid (uid), msg); #else msg = NOT_SUPPORTED ("getpwuid"); return octave_passwd (); #endif } octave_passwd octave_passwd::getpwnam (const std::string& nm) { std::string msg; return getpwnam (nm, msg); } octave_passwd octave_passwd::getpwnam (const std::string& nm, std::string& msg) { #if defined (HAVE_GETPWNAM) msg = std::string (); return octave_passwd (::getpwnam (nm.c_str ()), msg); #else msg = NOT_SUPPORTED ("getpwnam"); return octave_passwd (); #endif } int octave_passwd::setpwent (void) { std::string msg; return setpwent (msg); } int octave_passwd::setpwent (std::string& msg) { #if defined (HAVE_SETPWENT) msg = std::string (); ::setpwent (); return 0; #else msg = NOT_SUPPORTED ("setpwent"); return -1; #endif } int octave_passwd::endpwent (void) { std::string msg; return endpwent (msg); } int octave_passwd::endpwent (std::string& msg) { #if defined (HAVE_ENDPWENT) msg = std::string (); ::endpwent (); return 0; #else msg = NOT_SUPPORTED ("endpwent"); return -1; #endif } octave_passwd::octave_passwd (void *p, std::string& msg) : pw_name (), pw_passwd (), pw_uid (0), pw_gid (0), pw_gecos (), pw_dir (), pw_shell (), valid (false) { #if defined (HAVE_PWD_H) msg = std::string (); if (p) { struct passwd *pw = static_cast<struct passwd *> (p); pw_name = pw->pw_name; pw_passwd = pw->pw_passwd; pw_uid = pw->pw_uid; pw_gid = pw->pw_gid; pw_gecos = pw->pw_gecos; pw_dir = pw->pw_dir; pw_shell = pw->pw_shell; valid = true; } #else msg = NOT_SUPPORTED ("password functions"); #endif } void octave_passwd::gripe_invalid (void) const { (*current_liboctave_error_handler) ("invalid password object"); }