tst_libext2fs: Avoid multiple definition of global variables

[tools/e2fsprogs.git] / debugfs / debugfs.c

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index a270e8c..e33c92e 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -48,20 +48,28 @@ extern char *optarg;
 int journal_enable_debug = -1;
 #endif
 
+/*
+ * There must be only one definition if we're hooking in extra commands or
+ * chaging default prompt. Use -DSKIP_GLOBDEF for that.
+ */
+#ifndef SKIP_GLOBDEFS
 ss_request_table *extra_cmds;
 const char *debug_prog_name;
-int sci_idx;
+#endif
+int ss_sci_idx;
 
 ext2_filsys    current_fs;
 quota_ctx_t    current_qctx;
 ext2_ino_t     root, cwd;
+int            no_copy_xattrs;
 
 static int debugfs_setup_tdb(const char *device_name, char *undo_file,
                             io_manager *io_ptr)
 {
        errcode_t retval = ENOMEM;
-       char *tdb_dir = NULL, *tdb_file = NULL;
-       char *dev_name, *tmp_name;
+       const char      *tdb_dir = NULL;
+       char            *tdb_file = NULL;
+       char            *dev_name, *tmp_name;
 
        /* (re)open a specific undo file */
        if (undo_file && undo_file[0] != 0) {
@@ -171,7 +179,8 @@ static void open_filesystem(char *device, int open_flags, blk64_t superblock,
 try_open_again:
        retval = ext2fs_open(device, open_flags, superblock, blocksize,
                             io_ptr, &current_fs);
-       if (retval && !(open_flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) {
+       if (retval && (retval == EXT2_ET_SB_CSUM_INVALID) &&
+           !(open_flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) {
                open_flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
                printf("Checksum errors in superblock!  Retrying...\n");
                goto try_open_again;
@@ -215,7 +224,8 @@ errout:
                com_err(device, retval, "while trying to close filesystem");
 }
 
-void do_open_filesys(int argc, char **argv)
+void do_open_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        int     c, err;
        int     catastrophic = 0;
@@ -291,7 +301,8 @@ print_usage:
                "<device>\n", argv[0]);
 }
 
-void do_lcd(int argc, char **argv)
+void do_lcd(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+           void *infop EXT2FS_ATTR((unused)))
 {
        if (argc != 2) {
                com_err(argv[0], 0, "Usage: %s %s", argv[0], "<native dir>");
@@ -328,7 +339,8 @@ static void close_filesystem(NOARGS)
        return;
 }
 
-void do_close_filesys(int argc, char **argv)
+void do_close_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                     void *infop EXT2FS_ATTR((unused)))
 {
        int     c;
 
@@ -356,7 +368,8 @@ void do_close_filesys(int argc, char **argv)
 }
 
 #ifndef READ_ONLY
-void do_init_filesys(int argc, char **argv)
+void do_init_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_super_block param;
        errcode_t       retval;
@@ -416,7 +429,9 @@ static void print_bg_opts(ext2_filsys fs, dgrp_t group, int mask,
        }
 }
 
-void do_show_super_stats(int argc, char *argv[])
+void do_show_super_stats(int argc, char *argv[],
+                        int sci_idx EXT2FS_ATTR((unused)),
+                        void *infop EXT2FS_ATTR((unused)))
 {
        const char *units ="block";
        dgrp_t  i;
@@ -511,7 +526,9 @@ print_usage:
 
 #ifndef READ_ONLY
 void do_dirty_filesys(int argc EXT2FS_ATTR((unused)),
-                     char **argv EXT2FS_ATTR((unused)))
+                     char **argv EXT2FS_ATTR((unused)),
+                     int sci_idx EXT2FS_ATTR((unused)),
+                     void *infop EXT2FS_ATTR((unused)))
 {
        if (check_fs_open(argv[0]))
                return;
@@ -837,7 +854,7 @@ void internal_dump_inode(FILE *out, const char *prefix,
        if (is_large_inode && large_inode->i_extra_isize >= 32)
                fprintf(out, "   Project: %5d", large_inode->i_projid);
        fputs("   Size: ", out);
-       if (LINUX_S_ISREG(inode->i_mode))
+       if (LINUX_S_ISREG(inode->i_mode) || LINUX_S_ISDIR(inode->i_mode))
                fprintf(out, "%llu\n", EXT2_I_SIZE(inode));
        else
                fprintf(out, "%d\n", inode->i_size);
@@ -962,7 +979,8 @@ static void dump_inode(ext2_ino_t inode_num, struct ext2_inode *inode)
        close_pager(out);
 }
 
-void do_stat(int argc, char *argv[])
+void do_stat(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
        struct ext2_inode * inode_buf;
@@ -982,8 +1000,8 @@ void do_stat(int argc, char *argv[])
                return;
        }
 
-       if (debugfs_read_inode_full(inode, inode_buf, argv[0],
-                                       EXT2_INODE_SIZE(current_fs->super))) {
+       if (debugfs_read_inode2(inode, inode_buf, argv[0],
+                               EXT2_INODE_SIZE(current_fs->super), 0)) {
                free(inode_buf);
                return;
        }
@@ -993,7 +1011,8 @@ void do_stat(int argc, char *argv[])
        return;
 }
 
-void do_dump_extents(int argc, char **argv)
+void do_dump_extents(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_inode inode;
        ext2_ino_t      ino;
@@ -1064,7 +1083,8 @@ static int print_blocks_proc(ext2_filsys fs EXT2FS_ATTR((unused)),
        return 0;
 }
 
-void do_blocks(int argc, char *argv[])
+void do_blocks(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+              void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
 
@@ -1081,7 +1101,8 @@ void do_blocks(int argc, char *argv[])
        return;
 }
 
-void do_chroot(int argc, char *argv[])
+void do_chroot(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+              void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
        int retval;
@@ -1098,7 +1119,8 @@ void do_chroot(int argc, char *argv[])
 }
 
 #ifndef READ_ONLY
-void do_clri(int argc, char *argv[])
+void do_clri(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
        struct ext2_inode inode_buf;
@@ -1113,7 +1135,8 @@ void do_clri(int argc, char *argv[])
                return;
 }
 
-void do_freei(int argc, char *argv[])
+void do_freei(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        unsigned int    len = 1;
        int             err = 0;
@@ -1143,7 +1166,8 @@ void do_freei(int argc, char *argv[])
        ext2fs_mark_ib_dirty(current_fs);
 }
 
-void do_seti(int argc, char *argv[])
+void do_seti(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        unsigned int    len = 1;
        int             err = 0;
@@ -1174,7 +1198,8 @@ void do_seti(int argc, char *argv[])
 }
 #endif /* READ_ONLY */
 
-void do_testi(int argc, char *argv[])
+void do_testi(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
 
@@ -1188,7 +1213,8 @@ void do_testi(int argc, char *argv[])
 }
 
 #ifndef READ_ONLY
-void do_freeb(int argc, char *argv[])
+void do_freeb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t block;
        blk64_t count = 1;
@@ -1207,7 +1233,8 @@ void do_freeb(int argc, char *argv[])
        ext2fs_mark_bb_dirty(current_fs);
 }
 
-void do_setb(int argc, char *argv[])
+void do_setb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t block;
        blk64_t count = 1;
@@ -1227,7 +1254,8 @@ void do_setb(int argc, char *argv[])
 }
 #endif /* READ_ONLY */
 
-void do_testb(int argc, char *argv[])
+void do_testb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t block;
        blk64_t count = 1;
@@ -1311,7 +1339,8 @@ static void modify_u32(char *com, const char *prompt,
 }
 
 
-void do_modify_inode(int argc, char *argv[])
+void do_modify_inode(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_inode inode;
        ext2_ino_t      inode_num;
@@ -1388,7 +1417,9 @@ void do_modify_inode(int argc, char *argv[])
 }
 #endif /* READ_ONLY */
 
-void do_change_working_dir(int argc, char *argv[])
+void do_change_working_dir(int argc, char *argv[],
+                          int sci_idx EXT2FS_ATTR((unused)),
+                          void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
        int             retval;
@@ -1405,7 +1436,9 @@ void do_change_working_dir(int argc, char *argv[])
        return;
 }
 
-void do_print_working_directory(int argc, char *argv[])
+void do_print_working_directory(int argc, char *argv[],
+                               int sci_idx EXT2FS_ATTR((unused)),
+                               void *infop EXT2FS_ATTR((unused)))
 {
        int     retval;
        char    *pathname = NULL;
@@ -1494,7 +1527,8 @@ static void make_link(char *sourcename, char *destname)
 }
 
 
-void do_link(int argc, char *argv[])
+void do_link(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        if (common_args_process(argc, argv, 3, 3, "link",
                                "<source file> <dest_name>", CHECK_FS_RW))
@@ -1516,7 +1550,8 @@ static int mark_blocks_proc(ext2_filsys fs, blk64_t *blocknr,
        return 0;
 }
 
-void do_undel(int argc, char *argv[])
+void do_undel(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
        struct ext2_inode inode;
@@ -1579,7 +1614,8 @@ static void unlink_file_by_name(char *filename)
        return;
 }
 
-void do_unlink(int argc, char *argv[])
+void do_unlink(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+              void *infop EXT2FS_ATTR((unused)))
 {
        if (common_args_process(argc, argv, 2, 2, "link",
                                "<pathname>", CHECK_FS_RW))
@@ -1588,7 +1624,8 @@ void do_unlink(int argc, char *argv[])
        unlink_file_by_name(argv[1]);
 }
 
-void do_copy_inode(int argc, char *argv[])
+void do_copy_inode(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                  void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      src_ino, dest_ino;
        unsigned char   buf[4096];
@@ -1605,18 +1642,20 @@ void do_copy_inode(int argc, char *argv[])
        if (!dest_ino)
                return;
 
-       if (debugfs_read_inode_full(src_ino, (struct ext2_inode *) buf,
-                                   argv[0], sizeof(buf)))
+       if (debugfs_read_inode2(src_ino, (struct ext2_inode *) buf,
+                               argv[0], sizeof(buf), 0))
                return;
 
-       if (debugfs_write_inode_full(dest_ino, (struct ext2_inode *) buf,
-                                    argv[0], sizeof(buf)))
+       if (debugfs_write_inode2(dest_ino, (struct ext2_inode *) buf,
+                                argv[0], sizeof(buf), 0))
                return;
 }
 
 #endif /* READ_ONLY */
 
-void do_find_free_block(int argc, char *argv[])
+void do_find_free_block(int argc, char *argv[],
+                       int sci_idx EXT2FS_ATTR((unused)),
+                       void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t free_blk, goal, first_free = 0;
        int             count;
@@ -1668,7 +1707,9 @@ void do_find_free_block(int argc, char *argv[])
        printf("\n");
 }
 
-void do_find_free_inode(int argc, char *argv[])
+void do_find_free_inode(int argc, char *argv[],
+                       int sci_idx EXT2FS_ATTR((unused)),
+                       void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      free_inode, dir;
        int             mode;
@@ -1708,7 +1749,8 @@ void do_find_free_inode(int argc, char *argv[])
 }
 
 #ifndef READ_ONLY
-void do_write(int argc, char *argv[])
+void do_write(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t       retval;
 
@@ -1721,7 +1763,8 @@ void do_write(int argc, char *argv[])
                com_err(argv[0], retval, 0);
 }
 
-void do_mknod(int argc, char *argv[])
+void do_mknod(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        unsigned long   major, minor;
        errcode_t       retval;
@@ -1765,12 +1808,14 @@ void do_mknod(int argc, char *argv[])
                goto usage;
 
        st.st_rdev = makedev(major, minor);
-       retval = do_mknod_internal(current_fs, cwd, argv[1], &st);
+       retval = do_mknod_internal(current_fs, cwd, argv[1],
+                                  st.st_mode, st.st_rdev);
        if (retval)
                com_err(argv[0], retval, 0);
 }
 
-void do_mkdir(int argc, char *argv[])
+void do_mkdir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t retval;
 
@@ -1823,7 +1868,8 @@ static void kill_file_by_inode(ext2_ino_t inode)
 }
 
 
-void do_kill_file(int argc, char *argv[])
+void do_kill_file(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode_num;
 
@@ -1833,7 +1879,8 @@ void do_kill_file(int argc, char *argv[])
        kill_file_by_inode(inode_num);
 }
 
-void do_rm(int argc, char *argv[])
+void do_rm(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+          void *infop EXT2FS_ATTR((unused)))
 {
        int retval;
        ext2_ino_t inode_num;
@@ -1894,7 +1941,8 @@ static int rmdir_proc(ext2_ino_t dir EXT2FS_ATTR((unused)),
        return 0;
 }
 
-void do_rmdir(int argc, char *argv[])
+void do_rmdir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        int retval;
        ext2_ino_t inode_num;
@@ -1952,7 +2000,9 @@ void do_rmdir(int argc, char *argv[])
 #endif /* READ_ONLY */
 
 void do_show_debugfs_params(int argc EXT2FS_ATTR((unused)),
-                           char *argv[] EXT2FS_ATTR((unused)))
+                           char *argv[] EXT2FS_ATTR((unused)),
+                           int sci_idx EXT2FS_ATTR((unused)),
+                           void *infop EXT2FS_ATTR((unused)))
 {
        if (current_fs)
                printf("Open mode: read-%s\n",
@@ -1962,7 +2012,8 @@ void do_show_debugfs_params(int argc EXT2FS_ATTR((unused)),
 }
 
 #ifndef READ_ONLY
-void do_expand_dir(int argc, char *argv[])
+void do_expand_dir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
        int retval;
@@ -1976,7 +2027,8 @@ void do_expand_dir(int argc, char *argv[])
        return;
 }
 
-void do_features(int argc, char *argv[])
+void do_features(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        int     i;
 
@@ -1997,7 +2049,8 @@ void do_features(int argc, char *argv[])
 }
 #endif /* READ_ONLY */
 
-void do_bmap(int argc, char *argv[])
+void do_bmap(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
        blk64_t         blk, pblk = 0;
@@ -2060,7 +2113,8 @@ void do_bmap(int argc, char *argv[])
        fputc('\n', stdout);
 }
 
-void do_imap(int argc, char *argv[])
+void do_imap(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
        unsigned long   group, block, block_nr, offset;
@@ -2091,7 +2145,8 @@ void do_imap(int argc, char *argv[])
 
 }
 
-void do_idump(int argc, char *argv[])
+void do_idump(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_inode_large *inode;
        ext2_ino_t      ino;
@@ -2103,7 +2158,6 @@ void do_idump(int argc, char *argv[])
        reset_getopt();
        while ((c = getopt (argc, argv, "bex")) != EOF) {
                if (mode || c == '?') {
-               print_usage:
                        com_err(argv[0], 0,
                                "Usage: inode_dump [-b]|[-e] <file>");
                        return;
@@ -2144,7 +2198,6 @@ void do_idump(int argc, char *argv[])
        case 'x':
        case 'e':
                if (size <= EXT2_GOOD_OLD_INODE_SIZE) {
-               no_extra_space:
                        com_err(argv[0], 0, "No extra space in inode");
                        goto err;
                }
@@ -2163,7 +2216,9 @@ err:
 }
 
 #ifndef READ_ONLY
-void do_set_current_time(int argc, char *argv[])
+void do_set_current_time(int argc, char *argv[],
+                        int sci_idx EXT2FS_ATTR((unused)),
+                        void *infop EXT2FS_ATTR((unused)))
 {
        __s64 now;
 
@@ -2222,7 +2277,9 @@ static int find_supp_feature(__u32 *supp, int feature_type, char *name)
        return 0;
 }
 
-void do_supported_features(int argc, char *argv[])
+void do_supported_features(int argc, char *argv[],
+                          int sci_idx EXT2FS_ATTR((unused)),
+                          void *infop EXT2FS_ATTR((unused)))
 {
         int    ret;
        __u32   supp[3] = { EXT2_LIB_FEATURE_COMPAT_SUPP,
@@ -2250,7 +2307,8 @@ void do_supported_features(int argc, char *argv[])
 }
 
 #ifndef READ_ONLY
-void do_punch(int argc, char *argv[])
+void do_punch(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
        blk64_t         start, end;
@@ -2285,7 +2343,8 @@ void do_punch(int argc, char *argv[])
        }
 }
 
-void do_fallocate(int argc, char *argv[])
+void do_fallocate(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
        blk64_t         start, end;
@@ -2322,7 +2381,8 @@ void do_fallocate(int argc, char *argv[])
 }
 #endif /* READ_ONLY */
 
-void do_symlink(int argc, char *argv[])
+void do_symlink(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+               void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t       retval;
 
@@ -2337,7 +2397,9 @@ void do_symlink(int argc, char *argv[])
 }
 
 #if CONFIG_MMP
-void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
+void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[],
+                int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        struct mmp_struct *mmp_s;
        unsigned long long mmp_block;
@@ -2390,14 +2452,18 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
        fprintf(stdout, "check_interval: %d\n", mmp_s->mmp_check_interval);
        fprintf(stdout, "sequence: %08x\n", mmp_s->mmp_seq);
        fprintf(stdout, "time: %lld -- %s", mmp_s->mmp_time, ctime(&t));
-       fprintf(stdout, "node_name: %s\n", mmp_s->mmp_nodename);
-       fprintf(stdout, "device_name: %s\n", mmp_s->mmp_bdevname);
+       fprintf(stdout, "node_name: %.*s\n",
+               EXT2_LEN_STR(mmp_s->mmp_nodename));
+       fprintf(stdout, "device_name: %.*s\n",
+               EXT2_LEN_STR(mmp_s->mmp_bdevname));
        fprintf(stdout, "magic: 0x%x\n", mmp_s->mmp_magic);
        fprintf(stdout, "checksum: 0x%08x\n", mmp_s->mmp_checksum);
 }
 #else
 void do_dump_mmp(int argc EXT2FS_ATTR((unused)),
-                char *argv[] EXT2FS_ATTR((unused)))
+                char *argv[] EXT2FS_ATTR((unused)),
+                int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        fprintf(stdout, "MMP is unsupported, please recompile with "
                        "--enable-mmp\n");
@@ -2555,39 +2621,39 @@ int main(int argc, char **argv)
                                superblock, blocksize, catastrophic,
                                data_filename, undo_file);
 
-       sci_idx = ss_create_invocation(debug_prog_name, "0.0", (char *) NULL,
-                                      &debug_cmds, &retval);
+       ss_sci_idx = ss_create_invocation(debug_prog_name, "0.0", (char *) NULL,
+                                         &debug_cmds, &retval);
        if (retval) {
-               ss_perror(sci_idx, retval, "creating invocation");
+               ss_perror(ss_sci_idx, retval, "creating invocation");
                exit(1);
        }
-       ss_get_readline(sci_idx);
+       ss_get_readline(ss_sci_idx);
 
-       (void) ss_add_request_table (sci_idx, &ss_std_requests, 1, &retval);
+       (void) ss_add_request_table(ss_sci_idx, &ss_std_requests, 1, &retval);
        if (retval) {
-               ss_perror(sci_idx, retval, "adding standard requests");
+               ss_perror(ss_sci_idx, retval, "adding standard requests");
                exit (1);
        }
        if (extra_cmds)
-               ss_add_request_table (sci_idx, extra_cmds, 1, &retval);
+               ss_add_request_table(ss_sci_idx, extra_cmds, 1, &retval);
        if (retval) {
-               ss_perror(sci_idx, retval, "adding extra requests");
+               ss_perror(ss_sci_idx, retval, "adding extra requests");
                exit (1);
        }
        if (request) {
                retval = 0;
-               retval = ss_execute_line(sci_idx, request);
+               retval = ss_execute_line(ss_sci_idx, request);
                if (retval) {
-                       ss_perror(sci_idx, retval, request);
+                       ss_perror(ss_sci_idx, retval, request);
                        exit_status++;
                }
        } else if (cmd_file) {
-               exit_status = source_file(cmd_file, sci_idx);
+               exit_status = source_file(cmd_file, ss_sci_idx);
        } else {
-               ss_listen(sci_idx);
+               ss_listen(ss_sci_idx);
        }
 
-       ss_delete_invocation(sci_idx);
+       ss_delete_invocation(ss_sci_idx);
 
        if (current_fs)
                close_filesystem();