Print this page
6063 pkgadd breaks with too many mountpoints

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/svr4pkg/hdrs/libinst.h
          +++ new/usr/src/cmd/svr4pkg/hdrs/libinst.h
↓ open down ↓ 202 lines elided ↑ open up ↑
 203  203  extern char     *fixpath __P((char *path));
 204  204  extern char     *get_info_basedir __P((void));
 205  205  extern char     *get_basedir __P((void));
 206  206  extern char     *get_client_basedir __P((void));
 207  207  extern int      set_basedirs __P((int reloc, char *adm_basedir,
 208  208                      char *pkginst, int nointeract));
 209  209  extern int      eval_path __P((char **server_ptr, char **client_ptr,
 210  210                      char **map_ptr, char *path));
 211  211  extern int      get_orig_offset __P((void));
 212  212  extern char     *get_inst_root __P((void));
 213      -extern char     *get_mount_point __P((short n));
 214      -extern char     *get_remote_path __P((short n));
      213 +extern char     *get_mount_point __P((uint32_t n));
      214 +extern char     *get_remote_path __P((uint32_t n));
 215  215  extern void     set_env_cbdir __P((void));
 216  216  extern int      set_inst_root __P((char *path));
 217  217  extern void     put_path_params __P((void));
 218  218  extern int      mkpath __P((char *p));
 219  219  extern void     mkbasedir __P((int flag, char *path));
 220  220  extern int      is_an_inst_root __P((void));
 221  221  extern int      is_a_basedir __P((void));
 222  222  extern int      is_a_cl_basedir __P((void));
 223  223  extern int      is_relocatable __P((void));
 224  224  extern char     *orig_path __P((char *path));
↓ open down ↓ 10 lines elided ↑ open up ↑
 235  235                          boolean_t a_preinstallCheck));
 236  236  extern int      finalck __P((struct cfent *ept, int attrchg, int contchg,
 237  237                          boolean_t a_warning));
 238  238  
 239  239  /* dockdeps.c */
 240  240  extern void setUpdate __P((void));
 241  241  extern int  isUpdate __P((void));
 242  242  
 243  243  /* mntinfo.c */
 244  244  extern int      get_mntinfo __P((int map_client, char *vfstab_file));
 245      -extern short    fsys __P((char *path));
 246      -extern struct fstable *get_fs_entry __P((short n));
      245 +extern uint32_t fsys __P((char *path));
      246 +extern struct fstable *get_fs_entry __P((uint32_t n));
 247  247  extern int      mount_client __P((void));
 248  248  extern int      unmount_client __P((void));
 249      -extern short    resolved_fsys __P((char *path));
 250      -extern char     *get_server_host __P((short n));
 251      -extern char     *server_map __P((char *path, short fsys_value));
 252      -extern int      use_srvr_map __P((char *path, short *fsys_value));
 253      -extern int      use_srvr_map_n __P((short n));
 254      -extern int      is_fs_writeable __P((char *path, short *fsys_value));
 255      -extern int      is_remote_fs __P((char *path, short *fsys_value));
 256      -extern int      is_served __P((char *path, short *fsys_value));
 257      -extern int      is_mounted __P((char *path, short *fsys_value));
 258      -extern int      is_fs_writeable_n __P((short n));
 259      -extern int      is_remote_fs_n __P((short n));
 260      -extern int      is_served_n __P((short n));
 261      -extern int      is_mounted_n __P((short n));
 262      -extern fsblkcnt_t       get_blk_size_n __P((short n));
 263      -extern fsblkcnt_t       get_frag_size_n __P((short n));
 264      -extern fsblkcnt_t       get_blk_used_n __P((short n));
 265      -extern fsblkcnt_t       get_blk_free_n __P((short n));
 266      -extern fsblkcnt_t       get_inode_used_n __P((short n));
 267      -extern fsblkcnt_t       get_inode_free_n __P((short n));
 268      -extern void     set_blk_used_n __P((short n, fsblkcnt_t value));
 269      -extern char     *get_source_name_n __P((short n));
 270      -extern char     *get_fs_name_n __P((short n));
      249 +extern uint32_t resolved_fsys __P((char *path));
      250 +extern char     *get_server_host __P((uint32_t n));
      251 +extern char     *server_map __P((char *path, uint32_t fsys_value));
      252 +extern int      use_srvr_map __P((char *path, uint32_t *fsys_value));
      253 +extern int      use_srvr_map_n __P((uint32_t n));
      254 +extern int      is_fs_writeable __P((char *path, uint32_t *fsys_value));
      255 +extern int      is_remote_fs __P((char *path, uint32_t *fsys_value));
      256 +extern int      is_served __P((char *path, uint32_t *fsys_value));
      257 +extern int      is_mounted __P((char *path, uint32_t *fsys_value));
      258 +extern int      is_fs_writeable_n __P((uint32_t n));
      259 +extern int      is_remote_fs_n __P((uint32_t n));
      260 +extern int      is_served_n __P((uint32_t n));
      261 +extern int      is_mounted_n __P((uint32_t n));
      262 +extern fsblkcnt_t       get_blk_size_n __P((uint32_t n));
      263 +extern fsblkcnt_t       get_frag_size_n __P((uint32_t n));
      264 +extern fsblkcnt_t       get_blk_used_n __P((uint32_t n));
      265 +extern fsblkcnt_t       get_blk_free_n __P((uint32_t n));
      266 +extern fsblkcnt_t       get_inode_used_n __P((uint32_t n));
      267 +extern fsblkcnt_t       get_inode_free_n __P((uint32_t n));
      268 +extern void     set_blk_used_n __P((uint32_t n, fsblkcnt_t value));
      269 +extern char     *get_source_name_n __P((uint32_t n));
      270 +extern char     *get_fs_name_n __P((uint32_t n));
 271  271  extern int      load_fsentry __P((struct fstable *fs_entry, char *name,
 272  272                      char *fstype, char *remote_name));
 273  273  extern int      isreloc __P((char *pkginstdir));
 274  274  extern int      is_local_host __P((char *hostname));
 275  275  extern void     fs_tab_free __P((void));
 276  276  
 277  277  /* pkgdbmerg.c */
 278  278  extern int      pkgdbmerg __P((PKGserver server, VFP_T *tmpvfp,
 279  279                      struct cfextra **extlist));
 280  280  extern int      files_installed __P((void));
↓ open down ↓ 304 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX