[272] in BarnOwl Developers
attempting to rename package owl::
daemon@ATHENA.MIT.EDU (Sam Hartman)
Thu Oct 29 18:04:23 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
Date: Tue, 31 Oct 2006 23:18:07 -0500 (EST)
From: hartmans@MIT.EDU (Sam Hartman)
==== Patch <owl-barnowl> level 1
Source: [No source]
Target: 6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local/trunk/owl:1342 [local]
Log:
Rename owl:: to BarnOwl:: a lot of places
Try to move the call to the perlwrap code before the rest of the owlconf, but causes segfault
=== functions.c
==================================================================
--- functions.c (revision 1342)
+++ functions.c (patch owl-barnowl level 1)
@@ -1029,7 +1029,7 @@
}
/* execute the commands in shutdown */
- ret = owl_perlconfig_execute("owl::shutdown();");
+ ret = owl_perlconfig_execute("BarnOwl::shutdown();");
if (ret) owl_free(ret);
/* signal our child process, if any */
@@ -3307,8 +3307,8 @@
}
#endif
- if(owl_perlconfig_is_function("owl::get_blist")) {
- char * perlblist = owl_perlconfig_execute("owl::get_blist()");
+ if(owl_perlconfig_is_function("BarnOwl::get_blist")) {
+ char * perlblist = owl_perlconfig_execute("BarnOwl::get_blist()");
if(perlblist) {
owl_fmtext_append_ztext(&fm, perlblist);
owl_free(perlblist);
=== owl.c
==================================================================
--- owl.c (revision 1342)
+++ owl.c (patch owl-barnowl level 1)
@@ -325,8 +325,8 @@
if (owl_global_is_config_format(&g)) {
owl_function_debugmsg("Found perl formatting");
s=owl_malloc(sizeof(owl_style));
- owl_style_create_perl(s, "perl", "owl::_format_msg_legacy_wrap",
- "User-defined perl style that calls owl::format_msg"
+ owl_style_create_perl(s, "perl", "BarnOwl::_format_msg_legacy_wrap",
+ "User-defined perl style that calls BarnOwl::format_msg"
"with legacy global variable support");
owl_global_add_style(&g, s);
owl_global_set_default_style(&g, "perl");
@@ -334,7 +334,7 @@
/* execute the startup function in the configfile */
owl_function_debugmsg("startup: executing perl startup, if applicable");
- perlout = owl_perlconfig_execute("owl::startup();");
+ perlout = owl_perlconfig_execute("BarnOwl::startup();");
if (perlout) owl_free(perlout);
/* hold on to the window names for convenience */
@@ -447,7 +447,7 @@
/* Hook perl into the loop */
- if (owl_perlconfig_is_function("owl::mainloop_hook")) {
+ if (owl_perlconfig_is_function("BarnOwl::mainloop_hook")) {
owl_perlconfig_mainloop();
}
=== perlconfig.c
==================================================================
--- perlconfig.c (revision 1342)
+++ perlconfig.c (patch owl-barnowl level 1)
@@ -11,7 +11,7 @@
extern char *owl_perlwrap_codebuff;
-extern XS(boot_owl);
+extern XS(boot_BarnOwl);
extern XS(boot_DynaLoader);
// extern XS(boot_DBI);
@@ -20,7 +20,7 @@
char *file = __FILE__;
dXSUB_SYS;
{
- newXS("owl::bootstrap", boot_owl, file);
+ newXS("BarnOwl::bootstrap", boot_BarnOwl, file);
newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
}
}
@@ -85,12 +85,12 @@
hv_store(h, "deleted", strlen("deleted"), newSViv(owl_message_is_delete(m)),0);
hv_store(h, "private", strlen("private"), newSViv(owl_message_is_private(m)),0);
- if (owl_message_is_type_zephyr(m)) blessas = "owl::Message::Zephyr";
- else if (owl_message_is_type_aim(m)) blessas = "owl::Message::AIM";
- else if (owl_message_is_type_jabber(m)) blessas = "owl::Message::Jabber";
- else if (owl_message_is_type_admin(m)) blessas = "owl::Message::Admin";
- else if (owl_message_is_type_generic(m)) blessas = "owl::Message::Generic";
- else blessas = "owl::Message";
+ if (owl_message_is_type_zephyr(m)) blessas = "BarnOwl::Message::Zephyr";
+ else if (owl_message_is_type_aim(m)) blessas = "BarnOwl::Message::AIM";
+ else if (owl_message_is_type_jabber(m)) blessas = "BarnOwl::Message::Jabber";
+ else if (owl_message_is_type_admin(m)) blessas = "BarnOwl::Message::Admin";
+ else if (owl_message_is_type_generic(m)) blessas = "BarnOwl::Message::Generic";
+ else blessas = "BarnOwl::Message";
hr = sv_2mortal(newRV_noinc((SV*)h));
return sv_bless(hr, gv_stashpv(blessas,0));
@@ -185,7 +185,15 @@
perl_construct(p);
owl_global_set_no_have_config(&g);
+ perl_eval_pv(owl_perlwrap_codebuff, FALSE);
+ if (SvTRUE(ERRSV)) {
+ STRLEN n_a;
+ err=owl_strdup(SvPV(ERRSV, n_a));
+ sv_setsv (ERRSV, &PL_sv_undef); /* and clear the error */
+ return(err);
+ }
+
/* Before we let perl have at it, we'll do our own checks on the the
* file to see if it's present, readnable etc.
*/
@@ -227,30 +235,22 @@
owl_global_set_have_config(&g);
/* create legacy variables */
- perl_get_sv("owl::id", TRUE);
- perl_get_sv("owl::class", TRUE);
- perl_get_sv("owl::instance", TRUE);
- perl_get_sv("owl::recipient", TRUE);
- perl_get_sv("owl::sender", TRUE);
- perl_get_sv("owl::realm", TRUE);
- perl_get_sv("owl::opcode", TRUE);
- perl_get_sv("owl::zsig", TRUE);
- perl_get_sv("owl::msg", TRUE);
- perl_get_sv("owl::time", TRUE);
- perl_get_sv("owl::host", TRUE);
- perl_get_av("owl::fields", TRUE);
+ perl_get_sv("BarnOwl::id", TRUE);
+ perl_get_sv("BarnOwl::class", TRUE);
+ perl_get_sv("BarnOwl::instance", TRUE);
+ perl_get_sv("BarnOwl::recipient", TRUE);
+ perl_get_sv("BarnOwl::sender", TRUE);
+ perl_get_sv("BarnOwl::realm", TRUE);
+ perl_get_sv("BarnOwl::opcode", TRUE);
+ perl_get_sv("BarnOwl::zsig", TRUE);
+ perl_get_sv("BarnOwl::msg", TRUE);
+ perl_get_sv("BarnOwl::time", TRUE);
+ perl_get_sv("BarnOwl::host", TRUE);
+ perl_get_av("BarnOwl::fields", TRUE);
- perl_eval_pv(owl_perlwrap_codebuff, FALSE);
- if (SvTRUE(ERRSV)) {
- STRLEN n_a;
- err=owl_strdup(SvPV(ERRSV, n_a));
- sv_setsv (ERRSV, &PL_sv_undef); /* and clear the error */
- return(err);
- }
-
/* check if we have the formatting function */
- if (owl_perlconfig_is_function("owl::format_msg")) {
+ if (owl_perlconfig_is_function("BarnOwl::format_msg")) {
owl_global_set_config_format(&g, 1);
}
@@ -328,16 +328,16 @@
if (mode==1) {
char *ret = NULL;
ret = owl_perlconfig_call_with_message(subname?subname
- :"owl::_format_msg_legacy_wrap", m);
+ :"BarnOwl::_format_msg_legacy_wrap", m);
if (!ret) {
ret = owl_sprintf("@b([Perl Message Formatting Failed!])\n");
}
return ret;
} else {
char *ptr = NULL;
- if (owl_perlconfig_is_function("owl::receive_msg")) {
+ if (owl_perlconfig_is_function("BarnOwl::receive_msg")) {
ptr = owl_perlconfig_call_with_message(subname?subname
- :"owl::_receive_msg_legacy_wrap", m);
+ :"BarnOwl::_receive_msg_legacy_wrap", m);
}
if (ptr) owl_free(ptr);
return(NULL);
@@ -416,6 +416,6 @@
{
dSP ;
PUSHMARK(SP) ;
- call_pv("owl::mainloop_hook", G_DISCARD|G_EVAL|G_KEEPERR);
+ call_pv("BarnOwl::mainloop_hook", G_DISCARD|G_EVAL|G_KEEPERR);
return;
}
=== perlglue.xs
==================================================================
--- perlglue.xs (revision 1342)
+++ perlglue.xs (patch owl-barnowl level 1)
@@ -12,7 +12,7 @@
#define SV_IS_CODEREF(sv) (SvROK((sv)) && SvTYPE(SvRV((sv))) == SVt_PVCV)
-MODULE = owl PACKAGE = owl
+MODULE = BarnOwl PACKAGE = BarnOwl
char *
command(cmd)
=== perlwrap.pm
==================================================================
--- perlwrap.pm (revision 1342)
+++ perlwrap.pm (patch owl-barnowl level 1)
@@ -5,12 +5,16 @@
#####################################################################
#####################################################################
-package owl;
+package BarnOwl;
+BEGIN {
+ *owl:: = \*BarnOwl::;
+};
+
BEGIN {
# bootstrap in C bindings and glue
-bootstrap owl 1.2;
+bootstrap BarnOwl 1.2;
};
use lib(get_data_dir()."/owl/lib");
@@ -67,13 +71,13 @@
#####################################################################
#####################################################################
-package owl::Message;
+package BarnOwl::Message;
sub new {
my $class = shift;
my %args = (@_);
if($class eq __PACKAGE__ && $args{type}) {
- $class = "owl::Message::" . ucfirst $args{type};
+ $class = "BarnOwl::Message::" . ucfirst $args{type};
}
return bless {%args}, $class;
}
@@ -187,25 +191,25 @@
#####################################################################
#####################################################################
-package owl::Message::Admin;
+package BarnOwl::Message::Admin;
-@ISA = qw( owl::Message );
+@ISA = qw( BarnOwl::Message );
sub header { return shift->{"header"}; }
#####################################################################
#####################################################################
-package owl::Message::Generic;
+package BarnOwl::Message::Generic;
-@ISA = qw( owl::Message );
+@ISA = qw( BarnOwl::Message );
#####################################################################
#####################################################################
-package owl::Message::AIM;
+package BarnOwl::Message::AIM;
-@ISA = qw( owl::Message );
+@ISA = qw( BarnOwl::Message );
# all non-loginout AIM messages are personal for now...
sub is_personal {
@@ -215,9 +219,9 @@
#####################################################################
#####################################################################
-package owl::Message::Zephyr;
+package BarnOwl::Message::Zephyr;
-@ISA = qw( owl::Message );
+@ISA = qw( BarnOwl::Message );
sub login_tty {
my ($m) = @_;
@@ -272,9 +276,9 @@
#####################################################################
#####################################################################
-package owl::Message::Jabber;
+package BarnOwl::Message::Jabber;
-@ISA = qw( owl::Message );
+@ISA = qw( BarnOwl::Message );
#####################################################################
#####################################################################
